NO-ISSUE: Upgrade Kogito to 999-20240623-SNAPSHOT

packages/extended-services/env/index.js

@@ -19,7 +19,9 @@
 
 const { getOrDefault, varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
 
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
   vars: varsWithName({
     EXTENDED_SERVICES__kieSandboxUrl: {
       default: "https://localhost:9001",
@@ -38,15 +40,15 @@ module.exports = composeEnv([require("@kie-tools/root-env/env")], {
       description: "HTTP port",
     },
     EXTENDED_SERVICES__nativeBinaryPath_macOS: {
-      default: "./node_modules/@kie-tools/jitexecutor-native/dist/darwin/jitexecutor",
+      default: `./dist-dev/jitexecutor-native-darwin-${rootEnv.env.kogitoRuntime.version}-runner`,
       description: "",
     },
     EXTENDED_SERVICES__nativeBinaryPath_linux: {
-      default: "./node_modules/@kie-tools/jitexecutor-native/dist/linux/jitexecutor",
+      default: `./dist-dev/jitexecutor-native-linux-${rootEnv.env.kogitoRuntime.version}-runner`,
       description: "",
     },
     EXTENDED_SERVICES__nativeBinaryPath_win32: {
-      default: ".\\node_modules\\@kie-tools\\jitexecutor-native\\dist\\win32\\jitexecutor.exe",
+      default: `.\\dist-dev\\jitexecutor-native-win32-${rootEnv.env.kogitoRuntime.version}-runner.exe`,
       description: "",
     },
   }),

packages/extended-services/package.json

@@ -30,17 +30,24 @@
     "copy-jitexecutor:linux": "cp $(build-env extendedServices.jitexecutor.nativeBinaryPath.linux) jitexecutor && chmod +x jitexecutor",
     "copy-jitexecutor:win32": "pnpm powershell \"Copy-Item $(build-env extendedServices.jitexecutor.nativeBinaryPath.win32) jitexecutor\"",
     "copy-jitexecutor-linux-headless": "run-script-os",
-    "copy-jitexecutor-linux-headless:linux:darwin": "cp $(build-env extendedServices.jitexecutor.nativeBinaryPath.linux) jitexecutor && chmod +x jitexecutor",
-    "copy-jitexecutor-linux-headless:win32": "pnpm powershell \"Copy-Item $(build-env extendedServices.jitexecutor.nativeBinaryPath.linux) jitexecutor\"",
-    "install": "go mod tidy",
+    "copy-jitexecutor-linux-headless:darwin": "cp $(build-env extendedServices.jitexecutor.nativeBinaryPath.macOS) jitexecutor && chmod +x jitexecutor",
+    "copy-jitexecutor-linux-headless:linux": "cp $(build-env extendedServices.jitexecutor.nativeBinaryPath.linux) jitexecutor && chmod +x jitexecutor",
+    "copy-jitexecutor-linux-headless:win32": "pnpm powershell \"Copy-Item $(build-env extendedServices.jitexecutor.nativeBinaryPath.win32) jitexecutor\"",
+    "download:mvn:jitexecutor-native": "run-script-os",
+    "download:mvn:jitexecutor-native:darwin": "mvn dependency:get -Dartifact=\"org.kie.kogito:jitexecutor-native-darwin:$(build-env kogitoRuntime.version):jar:binaries\"",
+    "download:mvn:jitexecutor-native:linux": "mvn dependency:get -Dartifact=\"org.kie.kogito:jitexecutor-native-linux:$(build-env kogitoRuntime.version):jar:binaries\"",
+    "download:mvn:jitexecutor-native:win32": "pnpm powershell \"mvn dependency:get `-Dartifact=org.kie.kogito:jitexecutor-native-win32:$(build-env kogitoRuntime.version):jar:binaries\"",
+    "install": "go mod tidy && pnpm download:mvn:jitexecutor-native && pnpm unpack:mvn:jitexecutor-native",
     "pack-app": "run-script-os",
     "pack-app:darwin": "cd ./scripts/macos && ./build.sh",
     "pack-app:linux": "cd ./dist/linux && tar -pcvzf kie_sandbox_extended_services.tar.gz kie_sandbox_extended_services",
     "pack-app:win32": "echo 'Nothing to do'",
-    "start": "cross-env ENV=dev make start"
-  },
-  "dependencies": {
-    "@kie-tools/jitexecutor-native": "999.0.0-20240505-SNAPSHOT"
+    "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command",
+    "start": "cross-env ENV=dev make start",
+    "unpack:mvn:jitexecutor-native": "run-script-os",
+    "unpack:mvn:jitexecutor-native:darwin": "mvn dependency:unpack -DoutputDirectory=dist-dev -Dartifact=\"org.kie.kogito:jitexecutor-native-darwin:$(build-env kogitoRuntime.version):jar:binaries\"",
+    "unpack:mvn:jitexecutor-native:linux": "mvn dependency:unpack -DoutputDirectory=dist-dev -Dartifact=\"org.kie.kogito:jitexecutor-native-linux:$(build-env kogitoRuntime.version):jar:binaries\"",
+    "unpack:mvn:jitexecutor-native:win32": "pnpm powershell \"mvn dependency:unpack `-DoutputDirectory=dist-dev `-Dartifact=org.kie.kogito:jitexecutor-native-win32:$(build-env kogitoRuntime.version):jar:binaries\""
   },
   "devDependencies": {
     "@kie-tools/root-env": "workspace:*",

packages/extended-services/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+<project
+  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"
+>
+  <!-- Purposefully not declaring maven-base as parent -->
+  <!-- As this package is not intended to be published. -->
+  <!-- This is only here to configure apache as a parent so -->
+  <!-- that we have access to the snapshots repository -->
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>32</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.kie.tools</groupId>
+  <artifactId>extended-services</artifactId>
+  <version>irrelevant</version>
+</project>

packages/maven-base/pom.xml

@@ -109,7 +109,7 @@
     <version.junit>4.13.2</version.junit>
     <surefire-plugin.version>3.2.5</surefire-plugin.version>
     <quarkus.platform.version>3.8.4</quarkus.platform.version>
-    <version.org.kie.kogito>999-20240509-SNAPSHOT</version.org.kie.kogito>
+    <version.org.kie.kogito>999-20240620-SNAPSHOT</version.org.kie.kogito>
     <quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
     <version.failsafe.plugin>3.0.0-M7</version.failsafe.plugin>

packages/root-env/env/index.js

@@ -62,7 +62,7 @@ module.exports = composeEnv([], {
     },
     /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
     KOGITO_RUNTIME_version: {
-      default: "999-20240509-SNAPSHOT",
+      default: "999-20240620-SNAPSHOT",
       description: "Kogito version to be used on dependency declaration.",
     },
     /* (end) */

packages/serverless-logic-web-tools-base-builder-image/Containerfile

@@ -17,7 +17,7 @@
 
 ARG KOGITO_IMAGE_TAG
 
-FROM --platform=linux/amd64 quay.io/kiegroup/kogito-base-builder-nightly:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
 
 ARG KUBECTL_VERSION
 

packages/serverless-logic-web-tools-base-builder-image/env/index.js

@@ -29,7 +29,7 @@ module.exports = composeEnv(
       },
       /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
       SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {
-        default: "999-20240509",
+        default: "999-20240620",
         description: "",
       },
       /* end */

packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile

@@ -17,7 +17,7 @@
 
 ARG KOGITO_IMAGE_TAG
 
-FROM --platform=linux/amd64 quay.io/kiegroup/kogito-base-builder-nightly:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
 
 ENV PATH="${PATH}:/usr/share/maven/bin"
 

packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js

@@ -25,7 +25,7 @@ module.exports = composeEnv([rootEnv, require("@kie-tools/serverless-logic-web-t
   vars: varsWithName({
     /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
     SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {
-      default: "999-20240509",
+      default: "999-20240620",
       description: "",
     },
     /* end */

packages/sonataflow-image-common/resources/tests/shell/README.md

@@ -26,7 +26,7 @@
 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-20240509-SNAPSHOT
+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.

packages/sonataflow-operator/bddframework/pkg/api/app/v1beta1/kogitoservices.go

@@ -201,7 +201,7 @@ type KogitoServiceSpec struct {
 	Env []corev1.EnvVar `json:"env,omitempty"`
 
 	// +optional
-	// Image definition for the service. Example: "quay.io/kiegroup/kogito-service:latest".
+	// Image definition for the service. Example: "docker.io/repo/kogito-service:latest".
 	//
 	// On OpenShift an ImageStream will be created in the current namespace pointing to the given image.
 	// +operator-sdk:csv:customresourcedefinitions:type=spec

packages/sonataflow-operator/controllers/platform/services/services.go

@@ -109,8 +109,8 @@ func (d DataIndexHandler) GetServiceImageName(persistenceType constants.Persiste
 	if persistenceType == constants.PersistenceTypeEphemeral && len(cfg.GetCfg().DataIndexEphemeralImageTag) > 0 {
 		return cfg.GetCfg().DataIndexEphemeralImageTag
 	}
-	// returns "quay.io/kiegroup/kogito-data-index-<persistence_layer>:<tag>"
-	return fmt.Sprintf("%s-%s-%s:%s", constants.KogitoImageNamePrefix, constants.DataIndexName, persistenceType.String(), version.GetKogitoVersion())
+	// returns "docker.io/apache/incubator-kie-kogito-data-index-<persistence_layer>:<tag>"
+	return fmt.Sprintf("%s-%s-%s:%s", constants.KogitoImageNamePrefix, constants.DataIndexName, persistenceType.String(), version.GetKogitoImagesTagVersion())
 }
 
 func (d DataIndexHandler) GetServiceName() string {
@@ -273,8 +273,8 @@ func (j JobServiceHandler) GetServiceImageName(persistenceType constants.Persist
 	if persistenceType == constants.PersistenceTypeEphemeral && len(cfg.GetCfg().JobsServiceEphemeralImageTag) > 0 {
 		return cfg.GetCfg().JobsServiceEphemeralImageTag
 	}
-	// returns "quay.io/kiegroup/kogito-jobs-service-<persistece_layer>:<tag>"
-	return fmt.Sprintf("%s-%s-%s:%s", constants.KogitoImageNamePrefix, constants.JobServiceName, persistenceType.String(), version.GetKogitoVersion())
+	// returns "docker.io/apache/incubator-kie-kogito-jobs-service-<persistece_layer>:<tag>"
+	return fmt.Sprintf("%s-%s-%s:%s", constants.KogitoImageNamePrefix, constants.JobServiceName, persistenceType.String(), version.GetKogitoImagesTagVersion())
 }
 
 func (j JobServiceHandler) GetServiceName() string {

packages/sonataflow-operator/controllers/profiles/common/constants/platform_services.go

@@ -58,7 +58,7 @@ const (
 	DataIndexServiceName  = "data-index-service"
 	JobServiceName        = "jobs-service"
 	ImageNamePrefix       = "docker.io/apache/incubator-kie-kogito"
-	KogitoImageNamePrefix = "quay.io/kiegroup/kogito"
+	KogitoImageNamePrefix = "docker.io/apache/incubator-kie-kogito"
 	DataIndexName         = "data-index"
 
 	DefaultDatabaseName   string = "sonataflow"

packages/sonataflow-operator/controllers/profiles/dev/profile_dev_test.go

@@ -233,7 +233,7 @@ func Test_devProfileWithImageSnapshotOverrideWithPlatform(t *testing.T) {
 
 	// check if the objects have been created
 	deployment := test.MustGetDeployment(t, client, workflow)
-	assert.Equal(t, "docker.io/customgroup/custom-swf-builder-nightly:42.43.7", deployment.Spec.Template.Spec.Containers[0].Image)
+	assert.Equal(t, "docker.io/customgroup/custom-swf-builder:42.43.7", deployment.Spec.Template.Spec.Containers[0].Image)
 }
 
 func Test_devProfileWithWPlatformWithoutDevBaseImageAndWithBaseImage(t *testing.T) {

packages/sonataflow-operator/test/testdata/platform/noservices/preview/ephemeral/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSION
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/platform/services/dev/ephemeral/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSION
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/platform/services/dev/postgreSQL/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
   services:
     dataIndex:
       enabled: false

packages/sonataflow-operator/test/testdata/platform/services/preview/cluster-wide-ephemeral/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSION
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/platform/services/preview/ephemeral-data-index/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSION
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/platform/services/preview/ephemeral-job-service/02-sonataflow_platform.yaml

@@ -25,7 +25,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSION
-          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240509-SNAPSHOT
+          value: org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-20240620-SNAPSHOT
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/sonataflow.org_v1alpha08_sonataflow-simpleops.yaml

@@ -30,7 +30,7 @@ metadata:
 spec:
   podTemplate:
     container:
-      image: quay.io/kiegroup/sonataflow-minimal-example:latest
+      image: docker.io/apache/incubator-kie-sonataflow-minimal-example:latest
   flow:
     start: HelloWorld
     states:

packages/sonataflow-operator/test/testdata/workflow/persistence/by_service/02-sonataflow_platform.yaml

@@ -26,7 +26,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240509-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
+          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240620-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/workflow/persistence/from_platform_overwritten_by_service/02-sonataflow_platform.yaml

@@ -36,7 +36,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240509-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
+          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240620-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/workflow/persistence/from_platform_with_di_and_js_services/02-sonataflow_platform.yaml

@@ -36,7 +36,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240509-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
+          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240620-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/workflow/persistence/from_platform_with_no_persistence_required/02-sonataflow_platform.yaml

@@ -36,7 +36,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240509-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
+          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240620-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/testdata/workflow/persistence/from_platform_without_di_and_js_services/02-sonataflow_platform.yaml

@@ -36,7 +36,7 @@ spec:
     template:
       buildArgs:
         - name: QUARKUS_EXTENSIONS
-          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240509-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
+          value: org.kie:kie-addons-quarkus-persistence-jdbc:999-20240620-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

packages/sonataflow-operator/test/yaml.go

@@ -240,7 +240,7 @@ func GetBasePlatformWithDevBaseImageInReadyPhase(namespace string) *operatorapi.
 	platform := GetBasePlatform()
 	platform.Namespace = namespace
 	platform.Status.Manager().MarkTrue(api.SucceedConditionType)
-	platform.Spec.DevMode.BaseImage = "docker.io/customgroup/custom-swf-builder-nightly:42.43.7"
+	platform.Spec.DevMode.BaseImage = "docker.io/customgroup/custom-swf-builder:42.43.7"
 	return platform
 }
 

packages/sonataflow-operator/version/version.go

@@ -31,9 +31,8 @@ const (
 	// When released, this version should reflect the `major.minor` version in the registry.
 	// For example, docker.io/apache/incubator-kie-sonataflow-operator:main -> 10.0
 	tagVersion = "main"
-	// Kogito version
-	// kogitoVersion = "999-20240509" TODO: Uncomment this and update the value via bump-version.sh
-	kogitoVersion = "latest"
+	// Kogito images tag version. Used for data-index and jobs-service images.
+	kogitoImagesTagVersion = "999-20240620"
 )
 
 // GetOperatorVersion gets the current binary version of the operator. Do not use it to compose image tags!
@@ -46,7 +45,7 @@ func GetTagVersion() string {
 	return tagVersion
 }
 
-// GetKogitoVersion gets the current kogito version for the upstream kogito images.
-func GetKogitoVersion() string {
-	return kogitoVersion
+// GetKogitoImagesTagVersion gets the current kogito version for the upstream kogito images.
+func GetKogitoImagesTagVersion() string {
+	return kogitoImagesTagVersion
 }