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 3d6452ede35 kie-issues#2378: 10.3.x+ stream: Move kogito-apps to
drools preserving Git-history and top-level directory structure (#3681)
3d6452ede35 is described below
commit 3d6452ede356214d3a6e21d3d94a74eaf595d265
Author: Kbowers <[email protected]>
AuthorDate: Wed Jul 29 21:31:39 2026 +0100
kie-issues#2378: 10.3.x+ stream: Move kogito-apps to drools preserving
Git-history and top-level directory structure (#3681)
---
packages/drools-and-kogito/README.md | 2 +-
packages/drools-and-kogito/env/index.js | 14 +-----------
packages/drools-and-kogito/install.js | 25 +++-------------------
packages/drools-and-kogito/printCacheKey.js | 4 +---
scripts/update-kogito-version/README.md | 2 +-
.../update-kogito-version/update_kogito_version.js | 25 +++-------------------
6 files changed, 10 insertions(+), 62 deletions(-)
diff --git a/packages/drools-and-kogito/README.md
b/packages/drools-and-kogito/README.md
index 5e0db140a66..8b000cd12fb 100644
--- a/packages/drools-and-kogito/README.md
+++ b/packages/drools-and-kogito/README.md
@@ -17,7 +17,7 @@
## @kie-tools-core/drools-and-kogito
-Builds Drools and Kogito Apps without installing any Maven artifacts to the
local Maven repository. This package will skip the `install` phase and deploy
the build result to `./dist/1st-party-m2`, so that there's no pollution of the
local Maven repository.
+Builds Drools without installing any Maven artifacts to the local Maven
repository. This package will skip the `install` phase and deploy the build
result to `./dist/1st-party-m2`, so that there's no pollution of the local
Maven repository.
A build is only triggered when the Kogito version (defined in
[@kie-tools/root-env](../root-env/README.md), via `KOGITO_RUNTIME_version`)
ends with `-local` (E.g., `999-20250706-local`). Otherwise, this package
assumes that the version is coming from a remote Maven repository, or is
already installed locally in the local Maven repository. For versions not
ending on `-local`, you can still have this package trigger a build by using
the `DROOLS_AND_KOGITO__forceBuild` env var.
diff --git a/packages/drools-and-kogito/env/index.js
b/packages/drools-and-kogito/env/index.js
index e33c52fac1b..48f745da08a 100644
--- a/packages/drools-and-kogito/env/index.js
+++ b/packages/drools-and-kogito/env/index.js
@@ -28,17 +28,9 @@ module.exports = composeEnv([rootEnv], {
description: "Git repository URL for Drools",
},
DROOLS_AND_KOGITO__droolsRepoGitRef: {
- default: "9fa488684650e3fb163e34069b8ba9dc83ee89c1",
+ default: "8816430978be02c31a59d8e35a629c3fab6dd37e",
description: "Git ref for the Drools repository (SHA, branch, or tag)",
},
- DROOLS_AND_KOGITO__kogitoAppsRepoUrl: {
- default: "https://github.com/apache/incubator-kie-kogito-apps";,
- description: "Git repository URL for Kogito Apps",
- },
- DROOLS_AND_KOGITO__kogitoAppsRepoGitRef: {
- default: "384193e269eb42f75d1c2652e82f403e2c454dc2",
- description: "Git ref for the Kogito Apps repository (SHA, branch, or
tag)",
- },
DROOLS_AND_KOGITO__skip: {
default: `${false}`,
description:
@@ -64,10 +56,6 @@ module.exports = composeEnv([rootEnv], {
url: getOrDefault(this.vars.DROOLS_AND_KOGITO__droolsRepoUrl),
gitRef:
getOrDefault(this.vars.DROOLS_AND_KOGITO__droolsRepoGitRef),
},
- kogitoApps: {
- url: getOrDefault(this.vars.DROOLS_AND_KOGITO__kogitoAppsRepoUrl),
- gitRef:
getOrDefault(this.vars.DROOLS_AND_KOGITO__kogitoAppsRepoGitRef),
- },
},
cache: {
download:
getOrDefault(this.vars.DROOLS_AND_KOGITO__cacheDownloadCommand),
diff --git a/packages/drools-and-kogito/install.js
b/packages/drools-and-kogito/install.js
index c4eaaf11bb0..c0b89718395 100644
--- a/packages/drools-and-kogito/install.js
+++ b/packages/drools-and-kogito/install.js
@@ -50,8 +50,7 @@ console.log(JSON.stringify(buildInfo, null, 2));
const buildInfoMatches =
buildInfo?.kogitoVersion === buildEnv.versions.kogito &&
- buildInfo?.droolsRepoGitRef === buildEnv.droolsAndKogito.repos.drools.gitRef
&&
- buildInfo?.kogitoAppsRepoGitRef ===
buildEnv.droolsAndKogito.repos.kogitoApps.gitRef;
+ buildInfo?.droolsRepoGitRef === buildEnv.droolsAndKogito.repos.drools.gitRef;
const localM2DirExists = fs.existsSync("./dist/1st-party-m2/repository");
const forceBuild = buildEnv.droolsAndKogito.forceBuild;
@@ -81,7 +80,6 @@ fs.mkdirSync("./dist-tmp", { recursive: true });
// cloning
const droolsRepoDir = path.join("dist-tmp", "drools");
-const kogitoAppsRepoDir = path.join("dist-tmp", "kogito-apps");
console.log(`[drools-and-kogito] Cloning Drools...`);
@@ -91,13 +89,6 @@ execSync(`git fetch origin
${buildEnv.droolsAndKogito.repos.drools.gitRef} && gi
cwd: droolsRepoDir,
});
-console.log(`[drools-and-kogito] Cloning Kogito Apps...`);
-execSync(`git clone --depth 1 ${buildEnv.droolsAndKogito.repos.kogitoApps.url}
"${kogitoAppsRepoDir}"`, execOpts);
-execSync(`git fetch origin ${buildEnv.droolsAndKogito.repos.kogitoApps.gitRef}
&& git checkout FETCH_HEAD`, {
- ...execOpts,
- cwd: kogitoAppsRepoDir,
-});
-
// update versions
const streamsMavenVersion =
buildEnv.root.streamName === "main"
@@ -135,7 +126,7 @@ removeMavenModule(`apps\\-integration\\-tests`);
console.log(`[drools-and-kogito] Building Drools...`);
try {
execSync(
- `mvn deploy -ntp -DskipTests -DskipITs -T 0.5C -Dformatter.skip
-Denforcer.skip=true -Dcheckstyle.skip=true -Dmaven.install.skip=true
-DaltDeploymentRepository=drools-and-kogito--dist-1st-party-m2::default::file:${DIST_REPO}`,
+ `mvn deploy -ntp -DskipTests -DskipITs -Dformatter.skip
-Denforcer.skip=true -Dcheckstyle.skip=true -Dmaven.install.skip=true
-DaltDeploymentRepository=drools-and-kogito--dist-1st-party-m2::default::file:${DIST_REPO}
-Dquarkus.container-image.build=false`,
{
...execOpts,
cwd: droolsRepoDir,
@@ -144,7 +135,7 @@ try {
} catch (e) {
// Try it again!
execSync(
- `mvn deploy -ntp -DskipTests -DskipITs -T 0.5C -Dformatter.skip
-Denforcer.skip=true -Dcheckstyle.skip=true -Dmaven.install.skip=true
-DaltDeploymentRepository=drools-and-kogito--dist-1st-party-m2::default::file:${DIST_REPO}`,
+ `mvn deploy -ntp -DskipTests -DskipITs -Dformatter.skip
-Denforcer.skip=true -Dcheckstyle.skip=true -Dmaven.install.skip=true
-DaltDeploymentRepository=drools-and-kogito--dist-1st-party-m2::default::file:${DIST_REPO}
-Dquarkus.container-image.build=false`,
{
...execOpts,
cwd: droolsRepoDir,
@@ -152,15 +143,6 @@ try {
);
}
-console.log(`[drools-and-kogito] Building Kogito Apps...`);
-execSync(
- `mvn deploy -ntp -DskipTests -DskipITs -T 0.5C -Dformatter.skip
-Denforcer.skip=true -Dcheckstyle.skip=true -Dmaven.install.skip=true
-Dmaven.repo.local.tail=${DIST_REPO}
-DaltDeploymentRepository=snapshot-repo::default::file:${DIST_REPO}
-Dquarkus.container-image.build=false`,
- {
- ...execOpts,
- cwd: kogitoAppsRepoDir,
- }
-);
-
console.log("[drools-and-kogito] Removing source code directory to free up
disk space... ");
fs.rmSync("./dist-tmp", { recursive: true });
@@ -172,7 +154,6 @@ fs.writeFileSync(
JSON.stringify({
kogitoVersion: buildEnv.versions.kogito,
droolsRepoGitRef: buildEnv.droolsAndKogito.repos.drools.gitRef,
- kogitoAppsRepoGitRef: buildEnv.droolsAndKogito.repos.kogitoApps.gitRef,
}),
"utf-8"
);
diff --git a/packages/drools-and-kogito/printCacheKey.js
b/packages/drools-and-kogito/printCacheKey.js
index 1790cb2a6d3..5bf7b6ec3f4 100644
--- a/packages/drools-and-kogito/printCacheKey.js
+++ b/packages/drools-and-kogito/printCacheKey.js
@@ -21,6 +21,4 @@
const { env } = require("./env");
const repos = env.droolsAndKogito.repos;
-console.log(
-
`droolsRepoGitRef-${repos.drools.gitRef}-kogitoAppsRepoGitRef-${repos.kogitoApps.gitRef}-kogitoVersion-${env.versions.kogito}`
-);
+console.log(`droolsRepoGitRef-${repos.drools.gitRef}-kogitoVersion-${env.versions.kogito}`);
diff --git a/scripts/update-kogito-version/README.md
b/scripts/update-kogito-version/README.md
index 5e3808b5437..d17f05514eb 100644
--- a/scripts/update-kogito-version/README.md
+++ b/scripts/update-kogito-version/README.md
@@ -21,7 +21,7 @@ Updates the default value of `KOGITO_RUNTIME_version` of
`packages/root-env`, op
### Usage
-`pnpm update-kogito-version-to --maven {new-version} [--droolsGitRef {ref}
--kogitoAppsGitRef {ref}]`
+`pnpm update-kogito-version-to --maven {new-version} [--droolsGitRef {ref}]`
---
diff --git a/scripts/update-kogito-version/update_kogito_version.js
b/scripts/update-kogito-version/update_kogito_version.js
index 9f3c09b90fa..4732b4738d2 100755
--- a/scripts/update-kogito-version/update_kogito_version.js
+++ b/scripts/update-kogito-version/update_kogito_version.js
@@ -23,28 +23,19 @@ const execSync = require("child_process").execSync;
const newMavenVersion = process.argv[3];
if (!newMavenVersion) {
- console.error(
- "Usage 'node update_kogito_version.js --maven {version} [--droolsGitRef
{ref} --kogitoAppsGitRef {ref}]"
- );
+ console.error("Usage 'node update_kogito_version.js --maven {version}
[--droolsGitRef {ref}]");
return 1;
}
const newDroolsGitRef = process.argv[5] ?? "drools--n/a";
-const newKogitoAppsGitRef = process.argv[7] ?? "kogito-apps--n/a";
console.log(`[update-kogito-version] process.argv:`);
console.log(process.argv);
-if (
- process.argv[2] !== "--maven" ||
- (process.argv[4] && process.argv[4] !== "--droolsGitRef") ||
- (process.argv[6] && process.argv[6] !== "--kogitoAppsGitRef")
-) {
+if (process.argv[2] !== "--maven" || (process.argv[4] && process.argv[4] !==
"--droolsGitRef")) {
console.error("Arguments need to be passed in the correct order.");
console.error(`Argv: ${process.argv.join(", ")}`);
- console.error(
- "Usage 'node update_kogito_version.js --maven {version} [--droolsGitRef
{ref} --kogitoAppsGitRef {ref}]"
- );
+ console.error("Usage 'node update_kogito_version.js --maven {version}
[--droolsGitRef {ref}]");
process.exit(1);
}
@@ -73,16 +64,6 @@ try {
`DROOLS_AND_KOGITO__droolsRepoGitRef: {\n default:
"${newDroolsGitRef}"`
)
);
- fs.writeFileSync(
- droolsAndKogitoEnvPath,
- fs
- .readFileSync(droolsAndKogitoEnvPath, "utf-8")
- .replace(
-
/DROOLS_AND_KOGITO__kogitoAppsRepoGitRef:[\s\n]*{[\s\n]*default:[\s\n]*".*"/,
- `DROOLS_AND_KOGITO__kogitoAppsRepoGitRef: {\n default:
"${newKogitoAppsGitRef}"`
- )
- );
-
console.info(`[update-kogito-version] Bootstrapping with updated Kogito
version...`);
execSync(`pnpm bootstrap`, execOpts);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
