From e53c83f5003d7491acb1e8c321fd8ba3cb096da3 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Wed, 24 Jul 2024 14:42:52 +0200 Subject: [PATCH 1/4] Change buildchain project dependencies --- .ci/buildchain-project-dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/buildchain-project-dependencies.yaml b/.ci/buildchain-project-dependencies.yaml index c5c80d77c2..1cb7f1146a 100644 --- a/.ci/buildchain-project-dependencies.yaml +++ b/.ci/buildchain-project-dependencies.yaml @@ -25,11 +25,11 @@ dependencies: default: - source: development target: 9.x - - source: 8.x + - source: development target: main dependant: default: - source: 9.x target: development - source: main - target: 8.x + target: development From b72e74d633026aac5e5b9cff09f694cb94ec4969 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Thu, 25 Jul 2024 10:32:04 +0200 Subject: [PATCH 2/4] Change buildchain project dependencies, remove 9.x branch --- .ci/buildchain-project-dependencies.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci/buildchain-project-dependencies.yaml b/.ci/buildchain-project-dependencies.yaml index 1cb7f1146a..951427e382 100644 --- a/.ci/buildchain-project-dependencies.yaml +++ b/.ci/buildchain-project-dependencies.yaml @@ -23,13 +23,9 @@ dependencies: mapping: dependencies: default: - - source: development - target: 9.x - source: development target: main dependant: default: - - source: 9.x - target: development - source: main target: development From bde9beeed7a01553d81ebea6ab4589df6f013b65 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Thu, 25 Jul 2024 10:33:27 +0200 Subject: [PATCH 3/4] Updated branch.yaml --- .ci/jenkins/config/branch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 7c9031d949..316bb68802 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -33,7 +33,7 @@ repositories: job_display_name: optaplanner - name: incubator-kie-optaplanner-quickstarts job_display_name: optaplanner-quickstarts - branch: 8.x + branch: development # Not migrated to Apache yet # - name: incubator-kie-optaplanner-website # job_display_name: optaplanner-website From 5b242f0649ef2dc0580cdf7bc6178d56c7273a51 Mon Sep 17 00:00:00 2001 From: Luca Molteni Date: Thu, 25 Jul 2024 10:35:07 +0200 Subject: [PATCH 4/4] Updated Jenkinsfile.nightly --- .ci/jenkins/project/Jenkinsfile.nightly | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.ci/jenkins/project/Jenkinsfile.nightly b/.ci/jenkins/project/Jenkinsfile.nightly index 0339dc30b0..3607906055 100644 --- a/.ci/jenkins/project/Jenkinsfile.nightly +++ b/.ci/jenkins/project/Jenkinsfile.nightly @@ -88,9 +88,7 @@ pipeline { addSkipIntegrationTestsParam(buildParams) String quickstartsBranch switch (getBuildBranch()) { - case 'main': quickstartsBranch = '8.x' - break - case '9.x': quickstartsBranch = 'development' + case 'main': quickstartsBranch = 'development' break default : quickstartsBranch = getBuildBranch() }