Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.100.x-prod] Upgrade Quarkus to 3.8.4 #16

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/dmn-marshaller/tests/dmnValidation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/extended-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/kn-plugin-workflow/pkg/metadata/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
4 changes: 2 additions & 2 deletions packages/maven-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions packages/root-env/env/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
},
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = composeEnv(
description: "",
},
SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {
default: "999-20240417",
default: "999-20240505",
description: "",
},
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
`);
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = composeEnv(
description: "",
},
SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {
default: "999-20240417",
default: "999-20240505",
description: "",
},
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-deployment</artifactId>
<artifactId>quarkus-resteasy-client-deployment</artifactId>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required when using RHBQ 3.8.4 (Quarkus product) to workaround a bug on their release.

</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<version.npm>6.10.3</version.npm>
<version.pnpm>v8.7.0</version.pnpm>

<quarkus.platform.version>3.2.10.Final</quarkus.platform.version>
<quarkus.platform.version>3.8.4</quarkus.platform.version>
<version.org.kie.kogito>999-SNAPSHOT</version.org.kie.kogito>
</properties>

Expand Down
Loading