Skip to content

Configure CI for 3.10.x branch #11834

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.

Sign up for GitHub

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

Merged
slawekjaranowski merged 1 commit into from
Mar 25, 2026
Merged

Configure CI for 3.10.x branch #11834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Set up Maven
run:
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.11"
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.14"

- name: Build with Maven
run: ./mvnw verify -e -B -V -DdistributionFileName=apache-maven
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
run: |
set +e
repo=maven-integration-testing
target_branch=maven-3.9.x
target_branch=maven-3.10.x
target_user=apache
if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
user=${PR_HEAD_LABEL%:*}
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:

- name: Set up Maven
run:
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.11"
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.14"

- name: Running integration tests
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release-drafter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ name: Release Drafter
on:
push:
branches:
- maven-3.9.x
- maven-3.10.x
workflow_dispatch:

jobs:
update_release_draft:
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4
with:
config-name: 'release-drafter-3.x.yml'
config-name: 'release-drafter-3.x.yml'
initial-commits-since: '2026-03-09T10:55:05Z' # date of first commit on maven-3.10.x branch, 465a93ceb620266bf88bb1a0c9d69228630a4fb6
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='maven-3.9.x'?'5':'1'))])
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='maven-3.10.x'?'5':'1'))])

def buildOs = 'linux'
def buildJdk = '21'
Expand All @@ -41,7 +41,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
def MAVEN_GOAL='verify'

stage('Configure deploy') {
if (env.BRANCH_NAME in ['master', 'maven-3.8.x', 'maven-3.9.x']){
if (env.BRANCH_NAME in ['maven-3.10.x']){
MAVEN_GOAL='deploy'
}
}
Expand Down Expand Up @@ -94,7 +94,7 @@ for (String os in runITsOses) {
} catch (Throwable e) {
echo "Failure checkout ITs branch: ${ITS_BRANCH} - fallback maven-3.9.x branch"
checkout([$class: 'GitSCM',
branches: [[name: "maven-3.9.x"]],
branches: [[name: "maven-3.10.x"]],
extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
userRemoteConfigs: [[url: 'https://github.com/apache/maven-integration-testing.git']]])
}
Expand Down