Merge branch 'master' into mixins

Author: gnodet

.github/ISSUE_TEMPLATE/config.yml

@@ -24,7 +24,3 @@ contact_links:
   - name: Project Mailing Lists
     url: https://maven.apache.org/mailing-lists.html
     about: Please ask a question or discuss here
-
-  - name: Old JIRA Issues
-    url: https://issues.apache.org/jira/browse/MNG
-    about: Please search old JIRA issues

.github/dependabot.yml

@@ -22,6 +22,15 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "maven-4.0.x"
+    labels:
+      - "mvn40"
+      - "dependencies"
+
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
@@ -36,6 +45,15 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "maven-4.0.x"
+    labels:
+      - "mvn40"
+      - "dependencies"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/release-drafter-3.x.yml

@@ -16,3 +16,4 @@
 # under the License.
 
 _extends: maven-gh-actions-shared:.github/release-drafter.yml
+tag-template: maven-$RESOLVED_VERSION

.github/release-drafter.yml

@@ -16,6 +16,7 @@
 # under the License.
 
 _extends: maven-gh-actions-shared
+tag-template: maven-$RESOLVED_VERSION
 
 include-pre-releases: true
 prerelease: true

.github/workflows/maven.yml

@@ -31,13 +31,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: 17
           distribution: 'temurin'
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
 
@@ -49,7 +49,7 @@ jobs:
           cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
 
       - name: Handle Mimir caches
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.mimir/local
           key: mimir-${{ runner.os }}-initial-${{ hashFiles('**/pom.xml') }}
@@ -70,7 +70,7 @@ jobs:
         run: ls -la apache-maven/target
 
       - name: Upload Maven distributions
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: maven-distributions
           path: |
@@ -87,7 +87,7 @@ jobs:
         java: ['17', '21', '24']
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
@@ -105,7 +105,7 @@ jobs:
         run: choco install graphviz
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
 
@@ -118,7 +118,7 @@ jobs:
           cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
 
       - name: Handle Mimir caches
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.mimir/local
           key: mimir-${{ runner.os }}-full-${{ hashFiles('**/pom.xml') }}
@@ -127,7 +127,7 @@ jobs:
             mimir-${{ runner.os }}-
 
       - name: Download Maven distribution
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: maven-distributions
           path: maven-dist
@@ -166,7 +166,7 @@ jobs:
         run: mvn site -e -B -V -Preporting
 
       - name: Upload test artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: failure()
         with:
           name: ${{ github.run_number }}-full-build-artifact-${{ runner.os }}-${{ matrix.java }}
@@ -182,13 +182,13 @@ jobs:
         java: ['17', '21', '24']
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
       - name: Checkout maven
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
 
@@ -201,7 +201,7 @@ jobs:
           cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties
 
       - name: Handle Mimir caches
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.mimir/local
           key: mimir-${{ runner.os }}-its-${{ hashFiles('**/pom.xml') }}
@@ -210,7 +210,7 @@ jobs:
             mimir-${{ runner.os }}-
 
       - name: Download Maven distribution
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: maven-distributions
           path: maven-dist
@@ -245,7 +245,7 @@ jobs:
         run: mvn install -e -B -V -Prun-its,mimir
 
       - name: Upload test artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: failure()
         with:
           name: ${{ github.run_number }}-integration-test-artifact-${{ runner.os }}-${{ matrix.java }}

.mvn/maven.config

@@ -0,0 +1,2 @@
+# A hack to pass on this property for Maven 3 as well; Maven 4 supports this property out of the box
+-DsessionRootDirectory=${session.rootDirectory}

Jenkinsfile

@@ -6,45 +6,23 @@ pipeline {
   options {
     skipDefaultCheckout()
     durabilityHint('PERFORMANCE_OPTIMIZED')
-    //buildDiscarder logRotator( numToKeepStr: '60' )
     disableRestartFromStage()
   }
   stages {
-    stage("Parallel Stage") {
-      parallel {
-
-        stage("Build / Test - JDK17") {
-          agent { node { label 'ubuntu' } }
-          steps {
-              timeout(time: 210, unit: 'MINUTES') {
-                checkout scm
-                mavenBuild("jdk_17_latest", "-Djacoco.skip=true")
-                script {
-                  properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME == 'master' ? '30' : '5'))])
-                  if (env.BRANCH_NAME == 'master') {
-                    withEnv(["JAVA_HOME=${tool "jdk_17_latest"}",
-                             "PATH+MAVEN=${ tool "jdk_17_latest" }/bin:${tool "maven_3_latest"}/bin",
-                             "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) {
-                      sh "mvn clean deploy -DdeployAtEnd=true -B"
-                    }
-                  }
-                }
+    stage("Build / Test - JDK17") {
+      agent { node { label 'ubuntu' } }
+      steps {
+        timeout(time: 210, unit: 'MINUTES') {
+          checkout scm
+          mavenBuild("jdk_17_latest", "")
+          script {
+            properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: isDeployedBranch() ? '30' : '5'))])
+            if (isDeployedBranch()) {
+              withEnv(["JAVA_HOME=${tool "jdk_17_latest"}",
+                       "PATH+MAVEN=${ tool "jdk_17_latest" }/bin:${tool "maven_3_latest"}/bin",
+                       "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) {
+                sh "mvn clean deploy -DdeployAtEnd=true -B"
               }
-          }
-        }
-
-        stage("Build / Test - JDK21") {
-          agent { node { label 'ubuntu' } }
-          steps {
-            timeout(time: 210, unit: 'MINUTES') {
-              checkout scm
-              // jacoco is definitely too slow
-              mavenBuild("jdk_21_latest", "") // "-Pjacoco jacoco-aggregator:report-aggregate-all"
-              //              recordIssues id: "analysis-jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true,
-              //                            tools: [mavenConsole(), java(), checkStyle(), errorProne(), spotBugs(), javaDoc()],
-              //                            skipPublishingChecks: true, skipBlames: true
-              // recordCoverage id: "coverage-jdk21", name: "Coverage jdk21", tools: [[parser: 'JACOCO',pattern: 'target/site/jacoco-aggregate/jacoco.xml']],
-              //    sourceCodeRetention: 'MODIFIED', sourceDirectories: [[path: 'src/main/java']]
             }
           }
         }
@@ -53,8 +31,13 @@ pipeline {
   }
 }
 
+boolean isDeployedBranch() {
+  return env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'maven-4.0.x' || env.BRANCH_NAME == 'maven-3.9.x'
+}
+
 /**
  * To other developers, if you are using this method above, please use the following syntax.
+ * By default this method does NOT execute ITs anymore, just "install".
  *
  * mavenBuild("<jdk>", "<profiles> <goals> <plugins> <properties>"
  *
@@ -65,21 +48,15 @@ def mavenBuild(jdk, extraArgs) {
   script {
     try {
       withEnv(["JAVA_HOME=${tool "$jdk"}",
-               "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin",
+               "PATH+MAVEN=${tool "$jdk"}/bin:${tool "maven_3_latest"}/bin",
                "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) {
-        sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.9"
-        sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master"
-        // we use two steps so that we can cache artifacts downloaded from Maven Central repository
-        // without installing any local artifacts to not pollute the cache
-        sh "echo package Its"
-        sh "./mvnw package -DskipTests -e -B -V -Prun-its -Dmaven.repo.local=${env.WORKSPACE}/.repository/cached"
+        sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.10"
         sh "echo run Its"
-        sh "./mvnw install -Pci $extraArgs -Dmaven.home=${env.WORKSPACE}/.apache-maven-master -e -B -V -Prun-its -Dmaven.repo.local=${env.WORKSPACE}/.repository/local -Dmaven.repo.local.tail=${env.WORKSPACE}/.repository/cached"
+        sh "./mvnw -e -B -V install $extraArgs"
       }
     }
     finally {
       junit testResults: '**/target/test-results-surefire/*.xml', allowEmptyResults: true
     }
   }
 }
-// vim: et:ts=2:sw=2:ft=groovy

apache-maven/pom.xml

@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>4.0.0-rc-4-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-maven</artifactId>

…src/assembly/maven/conf/maven.properties …embly/maven/conf/maven-system.propertiesapache-maven/src/assembly/maven/conf/maven.properties renamed to apache-maven/src/assembly/maven/conf/maven-system.properties apache-maven/src/assembly/maven/conf/maven.properties renamed to apache-maven/src/assembly/maven/conf/maven-system.properties

@@ -18,10 +18,10 @@
 #
 
 #
-# Maven user properties
+# Maven system properties
 #
 # The properties defined in this file will be made available through
-# user properties at the very beginning of Maven's boot process.
+# system properties at the very beginning of Maven's boot process.
 #
 
 maven.installation.conf = ${maven.home}/conf
@@ -31,8 +31,8 @@ maven.project.conf      = ${session.rootDirectory}/.mvn
 # Comma-separated list of files to include.
 # Each item may be enclosed in quotes to gracefully include spaces. Items are trimmed before being loaded.
 # If the first character of an item is a question mark, the load will silently fail if the file does not exist.
-${includes} = ?"${maven.user.conf}/maven.properties", \
-              ?"${maven.project.conf}/maven.properties"
+${includes} = ?"${maven.user.conf}/maven-system.properties", \
+              ?"${maven.project.conf}/maven-system.properties"
 
 #
 # Settings

apache-maven/src/assembly/maven/conf/maven-user.properties

@@ -0,0 +1,31 @@
+#
+# 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.
+#
+
+#
+# Maven user properties
+#
+# The properties defined in this file will be made available through
+# user properties at the very beginning of Maven's boot process.
+#
+
+# Comma-separated list of files to include.
+# Each item may be enclosed in quotes to gracefully include spaces. Items are trimmed before being loaded.
+# If the first character of an item is a question mark, the load will silently fail if the file does not exist.
+${includes} = ?"${maven.user.conf}/maven-user.properties", \
+              ?"${maven.project.conf}/maven-user.properties"