Merge remote-tracking branch 'upstream/main' into issue-171-include-s…

…onataflow-webjar

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:

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

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}"

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

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
 

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}