diff --git a/.ci/environments/quarkus-lts/before.sh b/.ci/environments/quarkus-lts/before.sh deleted file mode 100755 index a14e406f43..0000000000 --- a/.ci/environments/quarkus-lts/before.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -set -euo pipefail - -script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P) - -"${script_dir_path}"/../common/update_quarkus.sh diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index bd75004222..6b9553f627 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -1,3 +1,20 @@ +generation_config: + missing_environments: ignore + +job_types: + setup_branch: + disabled: true + nightly: + disabled: false + other: + disabled: true + pullrequest: + disabled: false + release: + disabled: true + tools: + disabled: true + environments: native: env_vars: @@ -17,27 +34,6 @@ environments: QUARKUS_BRANCH: '2.16' ids: - quarkus - quarkus-lts: - pull_request_default_check: false - env_vars: - BUILD_MVN_OPTS: -Dproductized - QUARKUS_BRANCH: '2.13' - ids: - - quarkus - - lts - - prod - native-lts: - env_vars: - NATIVE: true - BUILD_MVN_OPTS: -Dproductized - BUILD_MVN_OPTS_CURRENT: -Dnative -Dquarkus.native.container-build=true - QUARKUS_BRANCH: '2.13' - QUARKUS_NATIVE_BUILDER_IMAGE: mandrel - ADDITIONAL_TIMEOUT: 720 - ids: - - native - - prod - - lts ecosystem: auto_generation: false ids: @@ -100,5 +96,5 @@ jenkins: email_creds_id: OPTAPLANNER_CI_EMAIL default_tools: jdk: kie-jdk17 - maven: kie-maven-3.8.7 + maven: kie-maven-3.9.3 sonar_jdk: kie-jdk17 diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 0eb0400189..a2faab85d0 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -219,12 +219,12 @@ setupDeployJob(JobType.NIGHTLY) setupSpecificBuildChainNightlyJob('native') setupSpecificBuildChainNightlyJob('quarkus-main') setupSpecificBuildChainNightlyJob('quarkus-branch') -setupSpecificBuildChainNightlyJob('quarkus-lts') -setupSpecificBuildChainNightlyJob('native-lts') +//setupSpecificBuildChainNightlyJob('quarkus-lts') +//setupSpecificBuildChainNightlyJob('native-lts') // Release jobs -setupDeployJob(JobType.RELEASE) -setupPromoteJob(JobType.RELEASE) +//setupDeployJob(JobType.RELEASE) +//setupPromoteJob(JobType.RELEASE) if (Utils.isMainBranch(this)) { setupOptaPlannerTurtleTestsJob('drools') diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4f2706c8c5..93ade56127 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,14 +1,5 @@ version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - time: '03:00' - open-pull-requests-limit: 0 - target-branch: "main" - commit-message: - prefix: "[bot]" - package-ecosystem: maven directory: "/" schedule: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b76b3608fa..d4313e5d4a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -78,14 +78,6 @@ How to retest this PR or trigger a specific build: Run checks against Quarkus main branch Please add comment: Jenkins (re)run [optaplanner|optaplanner-quickstarts] quarkus-branch -- for quarkus lts checks - Run checks against Quarkus lts branch - Please add comment: Jenkins run quarkus-lts - -- for a specific quarkus lts check - Run checks against Quarkus lts branch - Please add comment: Jenkins (re)run [optaplanner|optaplanner-quickstarts] quarkus-lts - - for native checks Run native checks Please add comment: Jenkins run native @@ -94,14 +86,6 @@ How to retest this PR or trigger a specific build: Run native checks Please add comment: Jenkins (re)run [optaplanner|optaplanner-quickstarts] native -- for native lts checks - Run native checks against quarkus lts branch - Please add comment: Jenkins run native-lts - -- for a specific native lts check - Run native checks against quarkus lts branch - Please add comment: Jenkins (re)run [optaplanner|optaplanner-quickstarts] native-lts - ### CI Status diff --git a/.github/workflows/full-downstream.yml b/.github/workflows/full-downstream.yml index edb2bc13f1..55e1ae5c3c 100644 --- a/.github/workflows/full-downstream.yml +++ b/.github/workflows/full-downstream.yml @@ -22,8 +22,8 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java-version: [ 11 ] - maven-version: [ '3.8.7' ] + java-version: [ 17 ] + maven-version: [ '3.9.3' ] fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven diff --git a/.github/workflows/optaplanner-9.yml b/.github/workflows/optaplanner-9.yml index dd944c6242..6cdcd91b55 100644 --- a/.github/workflows/optaplanner-9.yml +++ b/.github/workflows/optaplanner-9.yml @@ -25,7 +25,7 @@ jobs: matrix: os: [ ubuntu-latest ] java-version: [ 17 ] - maven-version: [ '3.8.7' ] + maven-version: [ '3.9.3' ] fail-fast: false runs-on: ${{ matrix.os }} @@ -42,7 +42,5 @@ jobs: maven-version: ${{ matrix.maven-version }} cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }} - - name: Migrate to 9 - run: ./build/8-to-9-migration/migrate.sh --no-version-upgrade --no-commit - name: Build with Maven run: mvn -B --fail-at-end clean install -Dfull -Dformatter.skip diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c64e99628f..e6063136d3 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] java-version: [ 11, 17, 20 ] - maven-version: [ '3.8.7' ] + maven-version: [ '3.9.3' ] fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven diff --git a/.github/workflows/quarkus-snapshot.yml b/.github/workflows/quarkus-snapshot.yml index e6f6d3d633..ad6bf19fdb 100644 --- a/.github/workflows/quarkus-snapshot.yml +++ b/.github/workflows/quarkus-snapshot.yml @@ -21,8 +21,8 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java-version: [ 11 ] - maven-version: [ '3.8.7' ] + java-version: [ 17 ] + maven-version: [ '3.9.3' ] fail-fast: false runs-on: ${{ matrix.os }} if: github.actor == 'quarkusbot'