This is an automated email from the ASF dual-hosted git repository.
yamer 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 fcede17348f kie-issue#958: Quarkus LTS Upgrade to 3.8.4 (#2272)
fcede17348f is described below
commit fcede17348f7bba64ff6ef482a48d0affe65b143
Author: Yeser Amer <[email protected]>
AuthorDate: Fri May 10 17:01:58 2024 +0200
kie-issue#958: Quarkus LTS Upgrade to 3.8.4 (#2272)
Co-authored-by: Rodrigo Antunes <[email protected]>
Co-authored-by: Tiago Bento <[email protected]>
Co-authored-by: Tiago Bento <[email protected]>
---
packages/dmn-marshaller/tests/dmnSemanticComparison.test.ts | 1 +
packages/dmn-marshaller/tests/dmnValidation.test.ts | 1 +
packages/extended-services/package.json | 2 +-
packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go | 2 +-
packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go | 2 +-
.../kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go | 3 +++
packages/kn-plugin-workflow/pkg/metadata/constants.go | 2 +-
packages/maven-base/pom.xml | 4 ++--
packages/root-env/env/index.js | 4 ++--
.../serverless-logic-web-tools-base-builder-image/env/index.js | 2 +-
.../install.js | 2 +-
.../serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml | 2 +-
.../serverless-logic-web-tools-swf-dev-mode-image/env/index.js | 2 +-
pnpm-lock.yaml | 8 ++++----
14 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/packages/dmn-marshaller/tests/dmnSemanticComparison.test.ts
b/packages/dmn-marshaller/tests/dmnSemanticComparison.test.ts
index 437e2fb63ad..93a7ccbdd8d 100644
--- a/packages/dmn-marshaller/tests/dmnSemanticComparison.test.ts
+++ b/packages/dmn-marshaller/tests/dmnSemanticComparison.test.ts
@@ -36,6 +36,7 @@ const dmnTestingModelsPath =
path.dirname(require.resolve("@kie-tools/dmn-testin
const dmnTestingModels = [
"dist/valid_models/DMNv1_5/AllowedValuesChecksInsideCollection.dmn",
+ "dist/valid_models/DMNv1_5/ConstraintsChecks.dmn",
"dist/valid_models/DMNv1_5/DateToDateTimeFunction.dmn",
"dist/valid_models/DMNv1_5/ForLoopDatesEvaluate.dmn",
"dist/valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
diff --git a/packages/dmn-marshaller/tests/dmnValidation.test.ts
b/packages/dmn-marshaller/tests/dmnValidation.test.ts
index 9c3c4a904d2..da3f1a33341 100644
--- a/packages/dmn-marshaller/tests/dmnValidation.test.ts
+++ b/packages/dmn-marshaller/tests/dmnValidation.test.ts
@@ -36,6 +36,7 @@ const dmnTestingModelsPath =
path.dirname(require.resolve("@kie-tools/dmn-testin
const dmnTestingModels = [
"dist/valid_models/DMNv1_5/AllowedValuesChecksInsideCollection.dmn",
+ "dist/valid_models/DMNv1_5/ConstraintsChecks.dmn",
"dist/valid_models/DMNv1_5/DateToDateTimeFunction.dmn",
"dist/valid_models/DMNv1_5/ForLoopDatesEvaluate.dmn",
"dist/valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
diff --git a/packages/extended-services/package.json
b/packages/extended-services/package.json
index 2ba9d2854cf..405ca614de6 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-20240417-SNAPSHOT"
+ "@kie-tools/jitexecutor-native": "999.0.0-20240505-SNAPSHOT"
},
"devDependencies": {
"@kie-tools/root-env": "workspace:*",
diff --git a/packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go
b/packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go
index 31e5e7005c7..e8d7726c904 100644
--- a/packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go
+++ b/packages/kn-plugin-workflow/e2e-tests/quarkus_convert_test.go
@@ -56,7 +56,7 @@ var cfgTestInputQuarkusConvert_Success =
[]CfgTestInputQuarkusConvert{
Extensions: "quarkus-jsonp,quarkus-smallrye-openapi",
DependenciesVersion: metadata.DependenciesVersion{
QuarkusPlatformGroupId: "io.quarkus.platform",
- QuarkusVersion: "3.2.10.Final",
+ QuarkusVersion: "3.8.4",
},
}},
}
diff --git a/packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go
b/packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go
index 782aca36ee7..200f50d808c 100644
--- a/packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go
+++ b/packages/kn-plugin-workflow/e2e-tests/quarkus_create_test.go
@@ -50,7 +50,7 @@ var cfgTestInputQuarkusCreate_Success =
[]CfgTestInputQuarkusCreate{
Extensions: "quarkus-jsonp,quarkus-smallrye-openapi",
DependenciesVersion: metadata.DependenciesVersion{
QuarkusPlatformGroupId: "io.quarkus.platform",
- QuarkusVersion: "3.2.10.Final",
+ QuarkusVersion: "3.8.4",
},
}},
}
diff --git a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
index c61cd2d1788..c39e124e9ba 100644
--- a/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
+++ b/packages/kn-plugin-workflow/pkg/command/quarkus/quarkus_project.go
@@ -122,6 +122,9 @@ func manipulatePomToKogito(filename string, cfg
CreateQuarkusProjectConfig) erro
dependencyElement := dependencies.CreateElement("dependency")
dependencyElement.CreateElement("groupId").SetText(dep.GroupId)
dependencyElement.CreateElement("artifactId").SetText(dep.ArtifactId)
+ if dep.Version != "" {
+
dependencyElement.CreateElement("version").SetText(dep.Version)
+ }
}
doc.Indent(4)
diff --git a/packages/kn-plugin-workflow/pkg/metadata/constants.go
b/packages/kn-plugin-workflow/pkg/metadata/constants.go
index 8dc3c610145..2b84c2b3361 100644
--- a/packages/kn-plugin-workflow/pkg/metadata/constants.go
+++ b/packages/kn-plugin-workflow/pkg/metadata/constants.go
@@ -41,7 +41,7 @@ var KogitoBomDependency = Dependency{
var KogitoDependencies = []Dependency{
{GroupId: "org.kie", ArtifactId: "kie-addons-quarkus-knative-eventing"},
{GroupId: "org.kie", ArtifactId: "kie-addons-quarkus-source-files"},
- {GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus-devui"},
+ {GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus-devui", Version: PluginVersion},
{GroupId: "org.kie", ArtifactId:
"kogito-addons-quarkus-data-index-inmemory"},
{GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus"},
}
diff --git a/packages/maven-base/pom.xml b/packages/maven-base/pom.xml
index d43d16222de..09190759322 100644
--- a/packages/maven-base/pom.xml
+++ b/packages/maven-base/pom.xml
@@ -76,8 +76,8 @@
<version.flatten.plugin>1.3.0</version.flatten.plugin>
<version.junit>4.13.2</version.junit>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
- <quarkus.platform.version>3.2.10.Final</quarkus.platform.version>
- <version.org.kie.kogito>999-20240417-SNAPSHOT</version.org.kie.kogito>
+ <quarkus.platform.version>3.8.4</quarkus.platform.version>
+ <version.org.kie.kogito>999-20240509-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>
diff --git a/packages/root-env/env/index.js b/packages/root-env/env/index.js
index c96c878113e..3820ed0360d 100644
--- a/packages/root-env/env/index.js
+++ b/packages/root-env/env/index.js
@@ -51,11 +51,11 @@ module.exports = composeEnv([], {
description: "Enables/disables building example packages during the
build.",
},
QUARKUS_PLATFORM_version: {
- default: "3.2.10.Final",
+ default: "3.8.4",
description: "Quarkus version to be used on dependency declaration.",
},
KOGITO_RUNTIME_version: {
- default: "999-20240417-SNAPSHOT",
+ default: "999-20240509-SNAPSHOT",
description: "Kogito version to be used on dependency declaration.",
},
}),
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 7210baf1c4d..23e66601910 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: "999-20240417",
+ default: "999-20240505",
description: "",
},
}),
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 5f4cc7c0b82..b562eaace2c 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
@@ -23,5 +23,5 @@ const { setup } =
require("@kie-tools/maven-config-setup-helper");
setup(`
-Drevision=${buildEnv.env.swfDeploymentQuarkusApp.version}
-Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version}
- -Dkogito.version=${buildEnv.env.kogitoRuntime.version}
+ -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version}
`);
diff --git
a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml
b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml
index f65cd96d0b9..a62de181587 100644
--- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml
+++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>${kogito.bom.group-id}</groupId>
<artifactId>${kogito.bom.artifact-id}</artifactId>
- <version>${kogito.version}</version>
+ <version>${version.org.kie.kogito}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
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 658917fa701..edfd5d09093 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_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {
- default: "999-20240417",
+ default: "999-20240505",
description: "",
},
}),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bcbcf0d811c..d565a163f47 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4370,8 +4370,8 @@ importers:
packages/extended-services:
dependencies:
"@kie-tools/jitexecutor-native":
- specifier: 999.0.0-20240417-SNAPSHOT
- version: 999.0.0-20240417-SNAPSHOT
+ specifier: 999.0.0-20240505-SNAPSHOT
+ version: 999.0.0-20240505-SNAPSHOT
devDependencies:
"@kie-tools/root-env":
specifier: workspace:*
@@ -23429,9 +23429,9 @@ packages:
{ integrity:
sha512-dxmfwq2F+yxawuGrVVRGmTeZHTqRHa79Vp4FX2KEXHAA9AgK1aaVz8mxZxXYFs2ycfp30NjWvhZCOIRbIKTjAQ==
}
dev: false
- /@kie-tools/[email protected]:
+ /@kie-tools/[email protected]:
resolution:
- { integrity:
sha512-SkRpqYfS24Y+C6rzH0MUozIYvBJvfZkHtCQ+coAxyu9G3aO4ksQLdd33bwWP/27yjjzI75yDmlL6RXG5/LBkkw==
}
+ { integrity:
sha512-swpesoPfMsMPlVBOmgAFp28QAfkN9t0fJOPEimK3ChIS/7u1mDaIOKDtceawfQPjVW9Pe0KK6lLMgHyay/oWfw==
}
dev: false
/@koa/[email protected]:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
