Jenkinsfile

@@ -21,16 +21,17 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e
 
 def buildOs = 'linux'
 def buildJdk = '8'
-def buildMvn = '3.5.0'
+def buildMvn = '3.5.4'
 def runITsOses = ['linux', 'windows']
 def runITsJdks = ['7', '8', '9']
-def runITsMvn = '3.5.0'
+def runITsMvn = '3.5.4'
 def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests
 
 try {
 
-node(jenkinsEnv.labelForOS(buildOs)) {
+def osNode = jenkinsEnv.labelForOS(buildOs) 
+node(jenkinsEnv.nodeSelection(osNode)) {
     dir('build') {
         stage('Checkout') {
             checkout scm
@@ -73,12 +74,12 @@ for (String os in runITsOses) {
         String stageId = "${os}-jdk${jdk}"
         String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}"
         runITsTasks[stageId] = {
-            node(osLabel) {
+            node(jenkinsEnv.nodeSelection(osLabel)) {
                 stage("${stageLabel}") {
                     // on Windows, need a short path or we hit 256 character limit for paths
                     // using EXECUTOR_NUMBER guarantees that concurrent builds on same agent
-                    // will not trample each other
-                    dir(isUnix() ? 'test' : "/mvn-it-${EXECUTOR_NUMBER}.tmp") {
+                    // will not trample each other plus workaround for JENKINS-52657
+                    dir(isUnix() ? 'test' : "c:\\mvn-it-${EXECUTOR_NUMBER}.tmp") {
                         def WORK_DIR=pwd()
                         checkout tests
                         if (isUnix()) {
@@ -91,10 +92,16 @@ for (String os in runITsOses) {
                         withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
                             junitPublisher(ignoreAttachments: false)
                         ]) {
+                            String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+                            if (stageId.endsWith('-jdk7')) {
+                              // Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
+                              cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
+                            }
+                            
                             if (isUnix()) {
-                                sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+                                sh "${cmd}"
                             } else {
-                                bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+                                bat "${cmd}"
                             }
                         }
                         deleteDir() // clean up after ourselves to reduce disk space

README.md

@@ -27,13 +27,13 @@ Apache Maven is a software project management and comprehension tool. Based on
 the concept of a project object model (POM), Maven can manage a project's
 build, reporting and documentation from a central piece of information.
 
-If you think you have found a bug, please file in an issue into [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
+If you think you have found a bug, please file an issue in the [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG).
 
 Documentation
 -------------
 
 More information can be found on [Apache Maven Homepage][maven-home].
-Question related to the usage of the Maven should be posted on
+Questions related to the usage of Maven should be posted on
 the [Maven User List][users-list].
 
 

apache-maven/pom.xml

@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.5.4</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>apache-maven</artifactId>
@@ -111,11 +111,6 @@ under the License.
     <finalName>${distributionFileName}</finalName>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.5</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
@@ -287,6 +282,33 @@ under the License.
               </execution>
             </executions>
           </plugin>
+          <!-- calculate checksums of source release for Apache dist area -->
+          <plugin>
+            <groupId>net.nicoulaj.maven.plugins</groupId>
+            <artifactId>checksum-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-checksum</id>
+                <goals>
+                  <goal>files</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <fileSets>
+                <fileSet>
+                  <directory>${project.build.directory}</directory>
+                  <includes>
+                    <include>${project.artifactId}-${project.version}-src.zip</include>
+                    <include>${project.artifactId}-${project.version}-src.tar.gz</include>
+                    <include>${project.artifactId}-${project.version}-bin.zip</include>
+                    <include>${project.artifactId}-${project.version}-bin.tar.gz</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+              <failIfNoFiles>true</failIfNoFiles>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>

apache-maven/src/main/appended-resources/META-INF/LICENSE.vm

@@ -17,31 +17,50 @@
 ## under the License.
 ##
 
+
 Apache Maven includes a number of components and libraries with separate 
 copyright notices and license terms. Your use of those components are 
-subject to the terms and conditions of the following licenses. 
-
-#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
-
+subject to the terms and conditions of the following licenses: 
+#
+#set ( $apacheLicenseNames = [ "Apache License, Version 2.0", "The Apache Software License, Version 2.0",
+    "ASLv2", "Apache Public License 2.0", "Apache 2.0" ] )
+#set ( $MITLicenseNames = [ "MIT License", "MIT license", "The MIT License" ] )
 #foreach ( $project in $projects )
-#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) ) 
-#set ( $artId = $project.artifact.artifactId)
-#set ( $lf = $locator )
-#set ( $url = $license.url )
-## glass fish URL is now invalid, use a fixed one
-#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
-#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
-#end
-#if ($url) 
-#set ( $licFile = 'lib/' + $artId + '.license' )
-#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
-#end
+#**##foreach ( $license in $project.licenses)
+#*  *##if ( !$apacheLicenseNames.contains( $license.name ) )
+#*    *##set ( $artId = $project.artifact.artifactId )
+#*    *##set ( $url = $license.url )
+#*    *##set ( $spdx = false )
+#*    *##set ( $includeLicense = true )
+#*    *###
+#*    *##if ( ( $project.artifact.toString() == "org.checkerframework:checker-compat-qual:jar:2.0.0" )
+              && ( $url == "http://www.gnu.org/software/classpath/license.html" ) )
+#*      *### checkerframework is MIT for qual: https://github.com/typetools/checker-framework/blob/master/LICENSE.txt
+#*      *##set ( $includeLicense = false )
+#*    *##end
+#*    *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" )
+#*      *##set ( $spdx = 'CDDL-1.0' )
+#*    *##end
+#*    *##if ( $MITLicenseNames.contains( $license.name ) )
+#*      *##set ( $spdx = 'MIT' )
+#*    *##end
+#*    *##if ( $license.name == "Eclipse Public License, Version 1.0" )
+#*      *##set ( $spdx = 'EPL-1.0' )
+#*    *##end
+#*    *##if ( $includeLicense )
+#*      *##if ( $url || $spdx )
+#*        *##set ( $licFile = 'lib/' + $artId + '.license' )
+#*        *##if ( $spdx )
+#*          *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) )
+#*        *##else
+#*          *##set ( $downloaded = $locator.getResourceAsFile( $url, "licenses/${licFile}" ) )
+#*        *##end
+#*      *##end
 
-$project.name #if ($project.url)($project.url)#end $project.artifact
-    License: $license.name #if ($url) $url ($licFile)#end
+- $project.name#if ( $project.url ) ($project.url)#end $project.artifact
+    License: $license.name#if ( $spdx ) ($spdx)#end#if ( $url )  $url ($licFile)#end
 
+#*    *##end
+#*  *##end
+#**##end
 #end
-#end
-#end
-

apache-maven/src/main/appended-resources/licenses/EPL-1.0.txt

+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+   1. DEFINITIONS
+
+   "Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+
+      b) in the case of each subsequent Contributor:
+
+         i) changes to the Program, and
+
+         ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from
+a Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include additions
+to the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program.
+
+   "Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including
+all Contributors.
+
+   2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
+prepare derivative works of, publicly display, publicly perform, distribute
+and sublicense the Contribution of such Contributor, if any, and such derivative
+works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and
+the Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered by
+the Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth
+in this Agreement.
+
+   3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages,
+such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through
+a medium customarily used for software exchange.
+
+   When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+   4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor
+who includes the Program in a commercial product offering should do so in
+a manner which does not create potential liability for other Contributors.
+Therefore, if a Contributor includes the Program in a commercial product offering,
+such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor
+to the extent caused by the acts or omissions of such Commercial Contributor
+in connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense
+and any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such Commercial
+Contributor's responsibility alone. Under this section, the Commercial Contributor
+would have to defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other Contributor
+to pay any damages as a result, the Commercial Contributor must pay those
+damages.
+
+   5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS
+OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+Each Recipient is solely responsible for determining the appropriateness of
+using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement, including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage
+to or loss of data, programs or equipment, and unavailability or interruption
+of operations.
+
+   6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+   7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of
+the terms of this Agreement, and without further action by the parties hereto,
+such provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware) infringes
+such Recipient's patent(s), then such Recipient's rights granted under Section
+2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming aware
+of such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as reasonably
+practicable. However, Recipient's obligations under this Agreement and any
+licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but
+in order to avoid inconsistency the Agreement is copyrighted and may only
+be modified in the following manner. The Agreement Steward reserves the right
+to publish new versions (including revisions) of this Agreement from time
+to time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse
+Foundation may assign the responsibility to serve as the Agreement Steward
+to a suitable separate entity. Each new version of the Agreement will be given
+a distinguishing version number. The Program (including Contributions) may
+always be distributed subject to the version of the Agreement under which
+it was received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property
+of any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual
+property laws of the United States of America. No party to this Agreement
+will bring a legal action under this Agreement more than one year after the
+cause of action arose. Each party waives its rights to a jury trial in any
+resulting litigation.

apache-maven/src/main/appended-resources/licenses/MIT.txt

+The MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS IN THE SOFTWARE.

debian/changelog

+maven (3.6.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Updated the Maven rules
+  * Generate Java 7 compatible bytecode
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 19 Nov 2018 10:15:50 +0100
+
 maven (3.5.4-1) unstable; urgency=medium
 
   * Team upload.

debian/maven.ignoreRules

@@ -3,3 +3,4 @@ org.codehaus.mojo buildnumber-maven-plugin * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.rat apache-rat-plugin * * * *
+org.xmlunit * * * * *

debian/maven.properties

@@ -2,6 +2,6 @@
 # For example:
 # maven.test.skip=true
 
-maven.compiler.release=8
+maven.compiler.release=7
 maven.test.skip=true
 project.build.sourceEncoding=UTF-8

debian/maven.rules

@@ -8,7 +8,7 @@ org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/1.7.1/1.5.5/ * *
 
 org.apache.maven apache-maven pom s/.*/3.x/ * *
-org.apache.maven maven-parent * s/.*/debian/ * *
+org.apache.maven maven-parent pom s/33/debian/ * *
 org.apache.maven maven* * s/.*/3.x/ * *
 
 com.google.inject guice * s/.*/debian/ s/no_aop// *

debian/patches/slf4j-compatibility.patch

@@ -84,7 +84,7 @@ Bug: https://github.com/apache/maven/pull/118
          </executions>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -579,6 +579,7 @@
+@@ -591,6 +591,7 @@
              <exclude>bootstrap/**</exclude>
              <exclude>README.bootstrap.txt</exclude>
              <exclude>README.md</exclude>

doap_Maven.rdf

@@ -26,13 +26,24 @@ under the License.
     <shortdesc>Maven is a project development management and comprehension tool.</shortdesc>
     <description>Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.</description>
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/MNG"/>
-    <mailing-list rdf:resource="https://maven.apache.org/mail-lists.html"/>
+    <mailing-list rdf:resource="https://maven.apache.org/mailing-lists.html"/>
     <download-page rdf:resource="https://maven.apache.org/download.html"/>
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/build-management"/>
     <release>
       <Version>
         <name>Latest stable release</name>
+        <created>2018-06-21</created>
+        <revision>3.5.4</revision>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip</file-release>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz</file-release>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.4/source/apache-maven-3.5.4-src.zip</file-release>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.4/source/apache-maven-3.5.4-src.tar.gz</file-release>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache Maven 3.5.3</name>
         <created>2018-03-08</created>
         <revision>3.5.3</revision>
         <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip</file-release>
@@ -43,7 +54,7 @@ under the License.
     </release>
     <release>
       <Version>
-        <name>Apache Maven 3.5.3</name>
+        <name>Apache Maven 3.5.2</name>
         <created>2017-10-24</created>
         <revision>3.5.2</revision>
         <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.zip</file-release>

maven-artifact/pom.xml

@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.5.4</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>maven-artifact</artifactId>

maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

@@ -273,7 +273,7 @@ public Collection<ArtifactMetadata> getMetadataList()
             return Collections.emptyList();
         }
 
-        return metadataMap.values();
+        return Collections.unmodifiableCollection( metadataMap.values() );
     }
 
     // ----------------------------------------------------------------------

maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java

@@ -20,16 +20,32 @@
  */
 
 /**
+ * An artifact handler defines for a dependency type, defined as Plexus role:<ul>
+ * <li>extension and classifier, to be able to download the file,</li>
+ * <li>information on how to use the artifact: whether to add it to the classpath, or to take into account its
+ * dependencies.</li>
+ * </ul>
+ * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  */
 public interface ArtifactHandler
 {
     String ROLE = ArtifactHandler.class.getName();
 
+    /**
+     * Get the file extension associated to the file represented by the dependency type.
+     *
+     * @return the file extension
+     */
     String getExtension();
 
     String getDirectory();
 
+    /**
+     * Get the classifier associated to the dependency type.
+     * 
+     * @return the classifier
+     */
     String getClassifier();
 
     String getPackaging();

maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java

@@ -262,7 +262,7 @@ public VersionRange restrict( VersionRange restriction )
         }
         else
         {
-            restrictions = intersection( r1, r2 );
+            restrictions = Collections.unmodifiableList( intersection( r1, r2 ) );
         }
 
         ArtifactVersion version = null;

maven-builder-support/pom.xml

@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.5.4</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>maven-builder-support</artifactId>
@@ -33,11 +33,4 @@ under the License.
   <name>Maven Builder Support</name>
   <description>Support for descriptor builders (model, setting, toolchains)</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-  </dependencies>
-
 </project>

maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java

@@ -23,8 +23,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
 
 /**
  * Wraps an ordinary {@link File} as a source.
@@ -43,7 +42,7 @@ public class FileSource
      */
     public FileSource( File file )
     {
-        this.file = Validate.notNull( file, "file cannot be null" ).getAbsoluteFile();
+        this.file = Objects.requireNonNull( file, "file cannot be null" ).getAbsoluteFile();
     }
 
     @Override

maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java

@@ -22,8 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
 
 /**
  * Wraps an ordinary {@link URL} as a source.
@@ -43,7 +42,7 @@ public class UrlSource
      */
     public UrlSource( URL url )
     {
-        this.url = Validate.notNull( url, "url cannot be null" );
+        this.url = Objects.requireNonNull( url, "url cannot be null" );
     }
 
     @Override