From b5ffc6f5b3a863926f1821df13525e930b7d3631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Locker?= Date: Tue, 13 Feb 2024 14:17:45 +0100 Subject: [PATCH] Update to OptaPlanner 999-SNAPSHOT (#625) * Update to OptaPlanner 999-SNAPSHOT * Update GHA references * Changes JBoss Nexus repository to Apache Nexus --- .github/workflows/full-downstream.yml | 2 +- .github/workflows/jenkins-tests-PR.yml | 8 +++---- .github/workflows/nightly.yml | 10 ++++----- .github/workflows/pull_request.yml | 2 +- build/optaplanner-distribution/pom.xml | 2 +- build/quickstarts-showcase/pom.xml | 2 +- hello-world/build.gradle | 4 ++-- hello-world/pom.xml | 6 +++--- pom.xml | 6 +++--- technology/java-activemq-quarkus/pom.xml | 26 ++++++++++++----------- technology/java-spring-boot/build.gradle | 4 ++-- technology/java-spring-boot/pom.xml | 6 +++--- technology/kotlin-quarkus/pom.xml | 6 +++--- technology/kubernetes/pom.xml | 9 ++++---- use-cases/call-center/pom.xml | 6 +++--- use-cases/employee-scheduling/pom.xml | 6 +++--- use-cases/facility-location/pom.xml | 6 +++--- use-cases/maintenance-scheduling/pom.xml | 6 +++--- use-cases/order-picking/pom.xml | 6 +++--- use-cases/school-timetabling/build.gradle | 4 ++-- use-cases/school-timetabling/pom.xml | 8 +++---- use-cases/vaccination-scheduling/pom.xml | 6 +++--- use-cases/vehicle-routing/pom.xml | 6 +++--- 23 files changed, 75 insertions(+), 72 deletions(-) diff --git a/.github/workflows/full-downstream.yml b/.github/workflows/full-downstream.yml index dbef22f8..3e4171a7 100644 --- a/.github/workflows/full-downstream.yml +++ b/.github/workflows/full-downstream.yml @@ -54,7 +54,7 @@ jobs: id: build-chain uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main with: - definition-file: https://raw.githubusercontent.com/${GROUP}/optaplanner/main/.ci/buildchain-config.yaml + definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM: "-Dfull" diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index ef27b4cf..a9d5db7a 100644 --- a/.github/workflows/jenkins-tests-PR.yml +++ b/.github/workflows/jenkins-tests-PR.yml @@ -3,7 +3,7 @@ name: Jenkins Tests on: pull_request: - paths: + paths: - '.ci/jenkins/**' - '.github/workflows/jenkins-tests-PR.yml' @@ -25,7 +25,7 @@ jobs: uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main with: project: optaplanner - main-config-file-repo: kiegroup/optaplanner + main-config-file-repo: apache/incubator-kie-optaplanner main-config-file-path: .ci/jenkins/config/main.yaml - branch-config-file-repo: kiegroup/optaplanner - base-branch: ${{ env.BASE_BRANCH }} \ No newline at end of file + branch-config-file-repo: apache/incubator-kie-optaplanner + base-branch: ${{ env.BASE_BRANCH }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5eb73e5d..f6b6d856 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -8,7 +8,7 @@ on: jobs: nightly: - if: github.repository == 'kiegroup/optaplanner-quickstarts' + if: github.repository == 'apache/incubator-kie-optaplanner-quickstarts' concurrency: group: nightly cancel-in-progress: true @@ -22,14 +22,14 @@ jobs: steps: - name: Support long paths if: ${{ matrix.os == 'windows-latest' }} - uses: kiegroup/kie-ci/.ci/actions/long-paths@main + uses: apache/incubator-kie-kogito-pipelines/.ci/actions/long-paths@main - name: Java and Maven Setup uses: apache/incubator-kie-kogito-pipelines/.ci/actions/maven@main with: java-version: ${{ matrix.java-version }} maven-version: ${{ matrix.maven-version }} cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Build with Maven run: mvn -B clean install --file pom.xml dependency:tree -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 - name: Set build information @@ -40,10 +40,10 @@ jobs: echo "action_url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV - name: Set failure message if: ${{ failure() }} - run: echo "zulip_message=:cross_mark:Build ERROR. See ${{env.action_url}}" >> $GITHUB_ENV + run: echo "zulip_message=:cross_mark:Build ERROR. See ${{env.action_url}}" >> $GITHUB_ENV - name: Set success message if: ${{ success() }} - run: echo "zulip_message=:check:Build OK. See ${{env.action_url}}" >> $GITHUB_ENV + run: echo "zulip_message=:check:Build OK. See ${{env.action_url}}" >> $GITHUB_ENV - name: Send a stream message if: ${{ always() }} uses: zulip/github-actions-zulip/send-message@v1 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 326908f6..7970ba63 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -46,7 +46,7 @@ jobs: - name: Build Chain uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main with: - definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml + definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-optaplanner/${BRANCH:main}/.ci/buildchain-config.yaml annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }} github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Surefire Report diff --git a/build/optaplanner-distribution/pom.xml b/build/optaplanner-distribution/pom.xml index e96abaef..3f573485 100644 --- a/build/optaplanner-distribution/pom.xml +++ b/build/optaplanner-distribution/pom.xml @@ -5,7 +5,7 @@ org.optaplanner optaplanner-quickstarts-parent - 9.45.0-SNAPSHOT + 999-SNAPSHOT ../../pom.xml diff --git a/build/quickstarts-showcase/pom.xml b/build/quickstarts-showcase/pom.xml index 714aa411..6eef6354 100644 --- a/build/quickstarts-showcase/pom.xml +++ b/build/quickstarts-showcase/pom.xml @@ -5,7 +5,7 @@ org.optaplanner optaplanner-quickstarts-parent - 9.45.0-SNAPSHOT + 999-SNAPSHOT ../../pom.xml diff --git a/hello-world/build.gradle b/hello-world/build.gradle index 0d543fdd..950f7eee 100644 --- a/hello-world/build.gradle +++ b/hello-world/build.gradle @@ -3,7 +3,7 @@ plugins { id "application" } -def optaplannerVersion = "9.45.0-SNAPSHOT" +def optaplannerVersion = "999-SNAPSHOT" def logbackVersion = "1.2.11" def junitJupiterVersion = "5.9.0" def assertjVersion = "3.24.2" @@ -15,7 +15,7 @@ repositories { mavenCentral() mavenLocal() maven { - url "https://repository.jboss.org/nexus/content/groups/public/" + url "https://repository.apache.org/content/groups/public/" mavenContent { snapshotsOnly() } diff --git a/hello-world/pom.xml b/hello-world/pom.xml index 7dfc502b..afc37cb6 100644 --- a/hello-world/pom.xml +++ b/hello-world/pom.xml @@ -12,7 +12,7 @@ UTF-8 hello-world-run - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.24.2 5.9.0 1.2.11 @@ -135,8 +135,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/pom.xml b/pom.xml index 4a8e05f0..bff55c01 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.optaplanner optaplanner-build-parent - 9.45.0-SNAPSHOT + 999-SNAPSHOT @@ -60,8 +60,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/technology/java-activemq-quarkus/pom.xml b/technology/java-activemq-quarkus/pom.xml index 265d4514..b09257bd 100644 --- a/technology/java-activemq-quarkus/pom.xml +++ b/technology/java-activemq-quarkus/pom.xml @@ -10,14 +10,16 @@ pom - 2.28.0 + 11 + UTF-8 + 3.0.0.Final - 9.45.0-SNAPSHOT + 2.28.0 + 999-SNAPSHOT - UTF-8 - 3.8.1 - 11 - 3.0.0-M8 + 3.8.1 + 1.0.8 + 3.0.0-M8 @@ -102,7 +104,7 @@ maven-compiler-plugin - ${compiler-plugin.version} + ${version.compiler.plugin} io.quarkus @@ -119,11 +121,11 @@ org.jboss.jandex jandex-maven-plugin - 1.0.8 + ${version.jandex.plugin} maven-surefire-plugin - ${surefire-plugin.version} + ${version.surefire.plugin} org.jboss.logmanager.LogManager @@ -146,7 +148,7 @@ maven-failsafe-plugin - ${surefire-plugin.version} + ${version.surefire.plugin} @@ -174,8 +176,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/technology/java-spring-boot/build.gradle b/technology/java-spring-boot/build.gradle index 54e45b1b..30e68f15 100644 --- a/technology/java-spring-boot/build.gradle +++ b/technology/java-spring-boot/build.gradle @@ -4,7 +4,7 @@ plugins { id "java" } -def optaplannerVersion = "9.45.0-SNAPSHOT" +def optaplannerVersion = "999-SNAPSHOT" def assertjVersion = "3.24.2" group = "org.acme" @@ -16,7 +16,7 @@ repositories { mavenCentral() mavenLocal() maven { - url "https://repository.jboss.org/nexus/content/groups/public/" + url "https://repository.apache.org/content/groups/public/" mavenContent { snapshotsOnly() } diff --git a/technology/java-spring-boot/pom.xml b/technology/java-spring-boot/pom.xml index 279f4ffd..62ed7e74 100644 --- a/technology/java-spring-boot/pom.xml +++ b/technology/java-spring-boot/pom.xml @@ -11,7 +11,7 @@ 17 UTF-8 - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.0.7 3.8.1 @@ -148,8 +148,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/technology/kotlin-quarkus/pom.xml b/technology/kotlin-quarkus/pom.xml index 1467f19c..a75ddc24 100644 --- a/technology/kotlin-quarkus/pom.xml +++ b/technology/kotlin-quarkus/pom.xml @@ -13,7 +13,7 @@ 3.0.0.Final 1.8.20 - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -278,8 +278,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/technology/kubernetes/pom.xml b/technology/kubernetes/pom.xml index 5b1dee77..4b4af8ff 100644 --- a/technology/kubernetes/pom.xml +++ b/technology/kubernetes/pom.xml @@ -19,9 +19,10 @@ 11 UTF-8 - 2.28.0 3.0.0.Final - 9.45.0-SNAPSHOT + 2.28.0 + 999-SNAPSHOT + 3.8.1 1.0.8 3.0.0-M8 @@ -162,8 +163,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/call-center/pom.xml b/use-cases/call-center/pom.xml index e9cd87c6..e60fc208 100644 --- a/use-cases/call-center/pom.xml +++ b/use-cases/call-center/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -198,8 +198,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/employee-scheduling/pom.xml b/use-cases/employee-scheduling/pom.xml index 14e277b2..6d6912f6 100644 --- a/use-cases/employee-scheduling/pom.xml +++ b/use-cases/employee-scheduling/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -215,8 +215,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/facility-location/pom.xml b/use-cases/facility-location/pom.xml index e826c585..e2a246e1 100644 --- a/use-cases/facility-location/pom.xml +++ b/use-cases/facility-location/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -188,8 +188,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/maintenance-scheduling/pom.xml b/use-cases/maintenance-scheduling/pom.xml index f657a557..61ff88f9 100644 --- a/use-cases/maintenance-scheduling/pom.xml +++ b/use-cases/maintenance-scheduling/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -215,8 +215,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/order-picking/pom.xml b/use-cases/order-picking/pom.xml index 2a6f3492..58ddae19 100644 --- a/use-cases/order-picking/pom.xml +++ b/use-cases/order-picking/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -195,8 +195,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/school-timetabling/build.gradle b/use-cases/school-timetabling/build.gradle index 8b6031d1..1d92fc83 100644 --- a/use-cases/school-timetabling/build.gradle +++ b/use-cases/school-timetabling/build.gradle @@ -4,7 +4,7 @@ plugins { } def quarkusVersion = "3.0.0.Final" -def optaplannerVersion = "9.45.0-SNAPSHOT" +def optaplannerVersion = "999-SNAPSHOT" def assertjVersion = "3.24.2" group = "org.acme" @@ -14,7 +14,7 @@ repositories { mavenCentral() mavenLocal() maven { - url "https://repository.jboss.org/nexus/content/groups/public/" + url "https://repository.apache.org/content/groups/public/" mavenContent { snapshotsOnly() } diff --git a/use-cases/school-timetabling/pom.xml b/use-cases/school-timetabling/pom.xml index cd495071..7a13550f 100644 --- a/use-cases/school-timetabling/pom.xml +++ b/use-cases/school-timetabling/pom.xml @@ -12,8 +12,8 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT - + 999-SNAPSHOT + 3.8.1 3.0.0-M8 @@ -223,8 +223,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/vaccination-scheduling/pom.xml b/use-cases/vaccination-scheduling/pom.xml index 5fe01e37..9a8760f8 100644 --- a/use-cases/vaccination-scheduling/pom.xml +++ b/use-cases/vaccination-scheduling/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -203,8 +203,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false diff --git a/use-cases/vehicle-routing/pom.xml b/use-cases/vehicle-routing/pom.xml index 84fd6863..3a30414d 100644 --- a/use-cases/vehicle-routing/pom.xml +++ b/use-cases/vehicle-routing/pom.xml @@ -12,7 +12,7 @@ UTF-8 3.0.0.Final - 9.45.0-SNAPSHOT + 999-SNAPSHOT 3.8.1 3.0.0-M8 @@ -209,8 +209,8 @@ - jboss-public-repository-group - https://repository.jboss.org/nexus/content/groups/public/ + apache-public-repository-group + https://repository.apache.org/content/groups/public/ false