This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 8a9cfdc9606 NO-ISSUE: Make sure `kie-tools` is using the latest
timestamped SNAPSHOT from Kogito (999-20240411-SNAPSHOT) (#2229)
8a9cfdc9606 is described below
commit 8a9cfdc96068471b38b931ee8259dbcacc26dad1
Author: Yeser Amer <[email protected]>
AuthorDate: Fri Apr 12 19:36:12 2024 +0200
NO-ISSUE: Make sure `kie-tools` is using the latest timestamped SNAPSHOT
from Kogito (999-20240411-SNAPSHOT) (#2229)
---
KOGITO_UPGRADE_PROCESS.md | 2 +-
packages/extended-services/package.json | 2 +-
packages/kn-plugin-workflow/env/index.js | 14 +-------------
packages/kn-plugin-workflow/package.json | 4 ++--
packages/online-editor/build/defaultEnvJson.ts | 4 ++--
packages/root-env/env/index.js | 2 +-
.../server/MockData/openAPI/openapi.json | 2 +-
.../env/index.js | 2 +-
.../env/index.js | 2 +-
.../env/index.js | 19 ++-----------------
.../install.js | 4 ++--
.../env/index.js | 2 +-
packages/stunner-editors/install.js | 1 +
packages/stunner-editors/pom.xml | 7 ++-----
.../src/test/resources/testProject/pom.xml | 3 +--
pnpm-lock.yaml | 8 ++++----
16 files changed, 24 insertions(+), 54 deletions(-)
diff --git a/KOGITO_UPGRADE_PROCESS.md b/KOGITO_UPGRADE_PROCESS.md
index b687b10f4c1..841f2b9464a 100644
--- a/KOGITO_UPGRADE_PROCESS.md
+++ b/KOGITO_UPGRADE_PROCESS.md
@@ -79,7 +79,7 @@ The Kogito version is present in the following file
categories:
The best (and fastest) way to catch all the Kogito versions is to perform a
search a grep (or the IDE integrated search) and replace it with the new
version. So, as a key, you can use:
- The version number: `X.Y.Z` or `X.Y.Z-YYYYMMDD-SNAPSHOT` format (eg.
`10.0.0` or `10.1.0-20240424-SNAPSHOT`);
-- Images references: `main-YYYY-MM-DD` or `X.Y.Z-YYYYMMDD` format (eg.
`main-2024-04-24` or `10.1.0-20240424` in case of snapshot version)
+- Images references: `main-YYYY-MM-DD` (Daily builds) or `X.Y.Z-YYYYMMDD`
(Weekly builds) format (eg. `main-2024-04-24` or `10.1.0-20240424` in case of
snapshot 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/extended-services/package.json
b/packages/extended-services/package.json
index dffd2f0833f..47a59ae7505 100644
--- a/packages/extended-services/package.json
+++ b/packages/extended-services/package.json
@@ -40,7 +40,7 @@
"start": "cross-env ENV=dev make start"
},
"dependencies": {
- "@kie-tools/jitexecutor-native": "999.0.0-20240331-SNAPSHOT"
+ "@kie-tools/jitexecutor-native": "999.0.0-20240411-SNAPSHOT"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
diff --git a/packages/kn-plugin-workflow/env/index.js
b/packages/kn-plugin-workflow/env/index.js
index 3aa6a23936e..7903a9a1dc1 100644
--- a/packages/kn-plugin-workflow/env/index.js
+++ b/packages/kn-plugin-workflow/env/index.js
@@ -32,30 +32,18 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
default: "io.quarkus.platform",
description: "Quarkus group to be used when creating the SonataFlow
project",
},
- KN_PLUGIN_WORKFLOW__quarkusVersion: {
- name: "KN_PLUGIN_WORKFLOW__quarkusVersion",
- default: "3.2.10.Final",
- description: "Quarkus version to be used when creating the SonataFlow
project",
- },
KN_PLUGIN_WORKFLOW__devModeImage: {
name: "KN_PLUGIN_WORKFLOW__devModeImage",
- default: "quay.io/kiegroup/kogito-swf-devmode-nightly:main-2024-04-03",
+ default: "quay.io/kiegroup/kogito-swf-devmode-nightly:999-20240411",
description: "SonataFlow dev mode image (used on cli run)",
},
- KN_PLUGIN_WORKFLOW__kogitoVersion: {
- name: "KN_PLUGIN_WORKFLOW__kogitoVersion",
- default: "999-20240331-SNAPSHOT",
- description: "Kogito version to be used when creating and converting to
Quarkus Projects",
- },
}),
get env() {
return {
knPluginWorkflow: {
version: getOrDefault(this.vars.KN_PLUGIN_WORKFLOW__version),
quarkusPlatformGroupId:
getOrDefault(this.vars.KN_PLUGIN_WORKFLOW__quarkusPlatformGroupId),
- quarkusVersion:
getOrDefault(this.vars.KN_PLUGIN_WORKFLOW__quarkusVersion),
devModeImage: getOrDefault(this.vars.KN_PLUGIN_WORKFLOW__devModeImage),
- kogitoVersion:
getOrDefault(this.vars.KN_PLUGIN_WORKFLOW__kogitoVersion),
},
};
},
diff --git a/packages/kn-plugin-workflow/package.json
b/packages/kn-plugin-workflow/package.json
index 667d871922e..1f0e5e78bbc 100644
--- a/packages/kn-plugin-workflow/package.json
+++ b/packages/kn-plugin-workflow/package.json
@@ -39,8 +39,8 @@
"go:test:report": "go run github.com/jstemmer/go-junit-report/v2
-set-exit-code -in ./dist-tests/go-test-output.txt -out
./dist-tests/junit-report.xml",
"install": "go mod tidy",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command",
- "setup:env": "cross-env QUARKUS_PLATFORM_GROUP_ID=$(build-env
knPluginWorkflow.quarkusPlatformGroupId) QUARKUS_VERSION=$(build-env
knPluginWorkflow.quarkusVersion) PLUGIN_VERSION=$(build-env
knPluginWorkflow.version) DEV_MODE_IMAGE=$(build-env
knPluginWorkflow.devModeImage) KOGITO_VERSION=$(build-env
knPluginWorkflow.kogitoVersion)",
- "setup:env:win32": "pnpm powershell \"cross-env
QUARKUS_PLATFORM_GROUP_ID=$(build-env knPluginWorkflow.quarkusPlatformGroupId)
QUARKUS_VERSION=$(build-env knPluginWorkflow.quarkusVersion)
DEV_MODE_IMAGE=$(build-env knPluginWorkflow.devModeImage)
KOGITO_VERSION=$(build-env knPluginWorkflow.kogitoVersion)
PLUGIN_VERSION=$(build-env knPluginWorkflow.version)\"",
+ "setup:env": "cross-env QUARKUS_PLATFORM_GROUP_ID=$(build-env
knPluginWorkflow.quarkusPlatformGroupId) QUARKUS_VERSION=$(build-env
quarkusPlatform.version) PLUGIN_VERSION=$(build-env knPluginWorkflow.version)
DEV_MODE_IMAGE=$(build-env knPluginWorkflow.devModeImage)
KOGITO_VERSION=$(build-env kogitoRuntime.version)",
+ "setup:env:win32": "pnpm powershell \"cross-env
QUARKUS_PLATFORM_GROUP_ID=$(build-env knPluginWorkflow.quarkusPlatformGroupId)
QUARKUS_VERSION=$(build-env quarkusPlatform.versionn)
DEV_MODE_IMAGE=$(build-env knPluginWorkflow.devModeImage)
KOGITO_VERSION=$(build-env kogitoRuntime.version) PLUGIN_VERSION=$(build-env
knPluginWorkflow.version)\"",
"test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env tests.run)\" --then \"pnpm
go:test\" \"pnpm go:test:report\"",
"test:e2e": "run-script-if --ignore-errors \"$(build-env
endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\"
--then \"pnpm go:test:e2e\" \"pnpm go:test:e2e:report\"",
"test:e2e:logs": "run-script-if --ignore-errors \"$(build-env
endToEndTests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\"
--then \"pnpm go:test:e2e:logs\" \"pnpm go:test:e2e:report\"",
diff --git a/packages/online-editor/build/defaultEnvJson.ts
b/packages/online-editor/build/defaultEnvJson.ts
index 4634b875142..23a04f9807a 100644
--- a/packages/online-editor/build/defaultEnvJson.ts
+++ b/packages/online-editor/build/defaultEnvJson.ts
@@ -108,8 +108,8 @@ export const defaultEnvJson: EnvJson = {
KIE_SANDBOX_ACCELERATORS: [
{
name: "Quarkus",
- iconUrl:
`https://github.com/kiegroup/kie-sandbox-quarkus-accelerator/raw/${buildEnv.root.version}/quarkus-logo.png`,
- gitRepositoryUrl:
"https://github.com/kiegroup/kie-sandbox-quarkus-accelerator";,
+ iconUrl:
`https://github.com/apache/incubator-kie-sandbox-quarkus-accelerator/raw/${buildEnv.root.version}/quarkus-logo.png`,
+ gitRepositoryUrl:
"https://github.com/apache/incubator-kie-sandbox-quarkus-accelerator";,
gitRepositoryGitRef: buildEnv.root.version,
dmnDestinationFolder: "src/main/resources/dmn",
bpmnDestinationFolder: "src/main/resources/bpmn",
diff --git a/packages/root-env/env/index.js b/packages/root-env/env/index.js
index 0e3e5b8e1be..7327b691f8d 100644
--- a/packages/root-env/env/index.js
+++ b/packages/root-env/env/index.js
@@ -55,7 +55,7 @@ module.exports = composeEnv([], {
description: "Quarkus version to be used on dependency declaration.",
},
KOGITO_RUNTIME_version: {
- default: "999-20240331-SNAPSHOT",
+ default: "999-20240411-SNAPSHOT",
description: "Kogito version to be used on dependency declaration.",
},
}),
diff --git
a/packages/runtime-tools-process-dev-ui-webapp/server/MockData/openAPI/openapi.json
b/packages/runtime-tools-process-dev-ui-webapp/server/MockData/openAPI/openapi.json
index 57a938c9e3b..9525786c2ee 100644
---
a/packages/runtime-tools-process-dev-ui-webapp/server/MockData/openAPI/openapi.json
+++
b/packages/runtime-tools-process-dev-ui-webapp/server/MockData/openAPI/openapi.json
@@ -2,7 +2,7 @@
"openapi": "3.0.3",
"info": {
"title": "process-usertasks-timer-quarkus-with-console API",
- "version": "999-SNAPSHOT"
+ "version": "1.0.0"
},
"paths": {
"/dataindex/forms/count": {
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 cdeef993fcb..6dbfa46a6ad 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
@@ -32,7 +32,7 @@ module.exports = composeEnv(
description: "",
},
SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {
- default: "main-2024-04-03",
+ default: "999-20240411",
description: "",
},
}),
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 152d0df40f8..1f68050326f 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
@@ -28,7 +28,7 @@ module.exports = composeEnv(
description: "",
},
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderKogitoImageTag: {
- default: "main-2024-04-03",
+ default: "999-20240411",
description: "",
},
}),
diff --git
a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js
b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js
index 8c459cbfee2..76cbadc2e35 100644
---
a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js
+++
b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js
@@ -17,29 +17,14 @@
* under the License.
*/
-const { varsWithName, composeEnv, getOrDefault } =
require("@kie-tools-scripts/build-env");
+const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
module.exports = composeEnv([require("@kie-tools/root-env/env")], {
- vars: varsWithName({
- SERVERLESS_LOGIC_WEB_TOOLS__quarkusPlatformVersion: {
- default: "3.2.10.Final",
- description: "Quarkus platform version",
- },
- SERVERLESS_LOGIC_WEB_TOOLS__kogitoVersion: {
- default: "999-20240331-SNAPSHOT",
- description: "Kogito version",
- },
- }),
+ vars: varsWithName({}),
get env() {
return {
swfDeploymentQuarkusApp: {
version: require("../package.json").version,
- quarkusPlatform: {
- version:
getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__quarkusPlatformVersion),
- },
- kogito: {
- version:
getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__kogitoVersion),
- },
},
};
},
diff --git
a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js
b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js
index ca8bc30d02b..5f4cc7c0b82 100644
--- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js
+++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js
@@ -22,6 +22,6 @@ const { setup } =
require("@kie-tools/maven-config-setup-helper");
setup(`
-Drevision=${buildEnv.env.swfDeploymentQuarkusApp.version}
-
-Dquarkus.platform.version=${buildEnv.env.swfDeploymentQuarkusApp.quarkusPlatform.version}
- -Dkogito.version=${buildEnv.env.swfDeploymentQuarkusApp.kogito.version}
+ -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version}
+ -Dkogito.version=${buildEnv.env.kogitoRuntime.version}
`);
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 c48e2745d1d..3092eeb5283 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
@@ -28,7 +28,7 @@ module.exports = composeEnv(
description: "",
},
SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeKogitoImageTag: {
- default: "main-2024-04-03",
+ default: "999-20240411",
description: "",
},
}),
diff --git a/packages/stunner-editors/install.js
b/packages/stunner-editors/install.js
index de2e2ccd77a..a9c7ff06ea9 100644
--- a/packages/stunner-editors/install.js
+++ b/packages/stunner-editors/install.js
@@ -22,4 +22,5 @@ const { setup } =
require("@kie-tools/maven-config-setup-helper");
setup(`
-Drevision=${buildEnv.env.stunnerEditors.version}
+ -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version}
`);
diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml
index 183a59993bb..251b63bdb21 100644
--- a/packages/stunner-editors/pom.xml
+++ b/packages/stunner-editors/pom.xml
@@ -307,6 +307,7 @@
<version.jarjar.plugin>1.5</version.jarjar.plugin>
<version.org.jvnet.jaxb2.maven2.maven-jaxb2-plugin>0.15.1</version.org.jvnet.jaxb2.maven2.maven-jaxb2-plugin>
<version.org.kie.gwthelper.maven>1.3</version.org.kie.gwthelper.maven>
+
<version.org.kogito.gwt-jsonix-schema-compiler>1.3.0</version.org.kogito.gwt-jsonix-schema-compiler>
<version.replacer.plugin>1.5.2</version.replacer.plugin>
<version.resources.plugin>3.2.0</version.resources.plugin>
<version.shade.plugin>3.2.1</version.shade.plugin>
@@ -318,10 +319,6 @@
<version.war.plugin>3.2.2</version.war.plugin>
<version.zanata.plugin>2.3.0</version.zanata.plugin>
- <!-- KIE Libraries -->
- <version.org.kie>999-20240331-SNAPSHOT</version.org.kie>
-
<version.org.kogito.gwt-jsonix-schema-compiler>1.3.0</version.org.kogito.gwt-jsonix-schema-compiler>
-
<!-- Third party Libraries -->
<version.ch.qos.logback>1.3.12</version.ch.qos.logback>
<version.com.google.elemental2>1.1.0</version.com.google.elemental2>
@@ -372,7 +369,7 @@
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-dmn-bom</artifactId>
- <version>${version.org.kie}</version>
+ <version>${version.org.kie.kogito}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
index ca5ac3231b0..c43bc2a6fa2 100644
---
a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
+++
b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/src/test/resources/testProject/pom.xml
@@ -26,9 +26,8 @@
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
- <version>8.22.0-SNAPSHOT</version>
+ <version>999-20240411-SNAPSHOT</version>
</dependency>
</dependencies>
-
</project>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 21e3c56761d..37791d48436 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4255,8 +4255,8 @@ importers:
packages/extended-services:
dependencies:
"@kie-tools/jitexecutor-native":
- specifier: 999.0.0-20240331-SNAPSHOT
- version: 999.0.0-20240331-SNAPSHOT
+ specifier: 999.0.0-20240411-SNAPSHOT
+ version: 999.0.0-20240411-SNAPSHOT
devDependencies:
"@kie-tools/root-env":
specifier: workspace:*
@@ -23136,9 +23136,9 @@ packages:
{ integrity:
sha512-dxmfwq2F+yxawuGrVVRGmTeZHTqRHa79Vp4FX2KEXHAA9AgK1aaVz8mxZxXYFs2ycfp30NjWvhZCOIRbIKTjAQ==
}
dev: false
- /@kie-tools/[email protected]:
+ /@kie-tools/[email protected]:
resolution:
- { integrity:
sha512-eG/KiUxc8t6u6WQ/O7KZsdXMvRv8EOQXPHSaTvmIA0TIrctc7+3LzyiAXpDD69CnTY6SmV8jmLUUkkv+Cusd1g==
}
+ { integrity:
sha512-8dDdH7yAo3HM4Rh1cmelrrcsIZR+NGkxpiNQYEge+yriIiU/j0GzD3Pu6blLqpYXuT3U/mlyKRcI+qP56GnlSw==
}
dev: false
/@koa/[email protected]:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
