.github/pull_request_template.md

+Following this checklist to help us incorporate your 
+contribution quickly and easily:
+
+ - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MNG) filed 
+       for the change (usually before you start working on it).  Trivial changes like typos do not 
+       require a JIRA issue.  Your pull request should address just this issue, without 
+       pulling in other changes.
+ - [ ] Each commit in the pull request should have a meaningful subject line and body.
+ - [ ] Format the pull request title like `[MNG-XXX] - Fixes bug in ApproximateQuantiles`,
+       where you replace `MNG-XXX` with the appropriate JIRA issue. Best practice
+       is to use the JIRA issue title in the pull request title and in the first line of the 
+       commit message.
+ - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
+ - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will 
+       be performed on your pull request automatically.
+ - [ ] You have run the [Core IT][core-its] successfully.
+
+If your pull request is about ~20 lines of code you don't need to sign an
+[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
+please ask on the developers list.
+
+To make clear that you license your contribution under 
+the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
+you have to acknowledge this by using the following check-box.
+
+ - [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
+
+ - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
+
+[core-its]: https://maven.apache.org/core-its/core-it-suite/

CONTRIBUTING.md

+<!---
+ 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.
+-->
+Contributing to Apache Maven 
+======================
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Some of the ideas are documented in the [Maven Wiki][maven-wiki]
+which might be interesting to read and for further discussion.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes 
+  on the [dev list](https://maven.apache.org/mail-lists.html) first. 
+  This way you can make sure you're not wasting your time on something that isn't 
+  considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+  + Clearly describe the issue, including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the
+main channel of communication for contributors.  
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+  Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+  patches should only highlight the actual difference, not being disturbed by any formatting issues:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable on save actions like reformat source code or organize imports. 
+    If you feel the source code should be reformatted, create a separate PR for this change.
+  + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MNG-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/[Core IT tests][core-it]) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA.  In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven JIRA project page](https://issues.apache.org/jira/projects/MNG/)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[dev-ml-list]: https://maven.apache.org/mail-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
+[core-it]: https://maven.apache.org/core-its/core-it-suite/

Jenkinsfile

@@ -20,10 +20,13 @@
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
 
 def buildOs = 'linux'
-def buildJdk = '7'
+def buildJdk = '8'
 def buildMvn = '3.5.0'
+def runITsOses = ['linux', 'windows']
+def runITsJdks = ['7', '8', '9']
+def runITsMvn = '3.5.0'
+def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests
-def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
@@ -55,99 +58,56 @@ node(jenkinsEnv.labelForOS(buildOs)) {
             }
         }
 
-        tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
+        tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
     }
 }
 
+Map runITsTasks = [:]
+for (String os in runITsOses) {
+    for (def jdk in runITsJdks) {
+        String osLabel = jenkinsEnv.labelForOS(os);
+        String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
+        String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}")
+        echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
 
-parallel linuxJava7:{
-        node(jenkinsEnv.labelForOS('linux')) {
-            stage ('Linux Java 7') {
-                String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
-                String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
-                dir('test') {
-                    def WORK_DIR=pwd()
-                    checkout tests
-                    sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
-                    unstash 'dist'
-                    withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
-                        junitPublisher(ignoreAttachments: false)
-                    ]) {
-                        sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    }
-                    deleteDir() // clean up after ourselves to reduce disk space
-                }
-            }
-        }
-    },linuxJava8: {
-        node(jenkinsEnv.labelForOS('linux')) {
-            stage ('Linux Java 8') {
-                String jdkName = jenkinsEnv.jdkFromVersion('linux', '8')
-                String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
-                dir('test') {
-                    def WORK_DIR=pwd()
-                    checkout tests
-                    sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
-                    unstash 'dist'
-                    withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
-                        junitPublisher(ignoreAttachments: false)
-                    ]) {
-                        sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    }
-                    deleteDir() // clean up after ourselves to reduce disk space
-                }
-            }
-        }
-    }, winJava7: {
-        node(jenkinsEnv.labelForOS('windows')) {
-            stage ('Windows Java 7') {
-                String jdkName = jenkinsEnv.jdkFromVersion('windows', '7')
-                String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn)
-
-                // need a short path or we hit 256 character limit for paths
+        String stageId = "${os}-jdk${jdk}"
+        String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}"
+        runITsTasks[stageId] = {
+            node(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("/mvn-it-${EXECUTOR_NUMBER}.tmp") {
+                    dir(isUnix() ? 'test' : "/mvn-it-${EXECUTOR_NUMBER}.tmp") {
                         def WORK_DIR=pwd()
                         checkout tests
+                        if (isUnix()) {
+                            sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
+                        } else {
                             bat "if exist it-local-repo rmdir /s /q it-local-repo"
                             bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip"
+                        }
                         unstash 'dist'
                         withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
                             junitPublisher(ignoreAttachments: false)
                         ]) {
-                        bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    }
-                    deleteDir() // clean up after ourselves to reduce disk space
+                            if (isUnix()) {
+                                sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+                            } else {
+                                bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
                             }
                         }
+                        deleteDir() // clean up after ourselves to reduce disk space
                     }
-    }, winJava8: {
-        node(jenkinsEnv.labelForOS('windows')) {
-            stage ('Windows Java 8') {
-                String jdkName = jenkinsEnv.jdkFromVersion('windows', '8')
-                String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn)
-
-                // 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("/mvn-it-${EXECUTOR_NUMBER}.tmp") {
-                    def WORK_DIR=pwd()
-                    checkout tests
-                    bat "if exist it-local-repo rmdir /s /q it-local-repo"
-                    bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip"
-                    unstash 'dist'
-                    withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
-                        junitPublisher(ignoreAttachments: false)
-                    ]) {
-                        bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
                 }
-                    deleteDir() // clean up after ourselves to reduce disk space
             }
         }
     }
 }
 
+// run the parallel ITs
+parallel(runITsTasks)
+
 // JENKINS-34376 seems to make it hard to detect the aborted builds
 } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
     // this ambiguous condition means a user probably aborted

NOTICE

 Apache Maven
-Copyright 2001-2015 The Apache Software Foundation
+Copyright 2001-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

-# Maven
+<!---
+ 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
 
-Maven is available under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+      http://www.apache.org/licenses/LICENSE-2.0
 
-- [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
-- [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
+ 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.
+-->
+Apache Maven
+============
 
-## Bootstrapping Basics
+[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven%22%20AND%20a%3A%22apache-maven%22)
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven/job/master.svg?style=flat-square)][build]
+[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven/job/master.svg?style=flat-square)][test-results]
 
-If you want to bootstrap Maven, you'll need:
 
-- Java 1.7+
-- Maven 3.0.5 or later
+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)
+
+Documentation
+-------------
+
+More information can be found on [Apache Maven Homepage][maven-home].
+Question related to the usage of the Maven should be posted on
+the [Maven User List][users-list].
+
+
+Where can I get the latest release?
+-----------------------------------
+You can download release source from our [download page][maven-download].
+
+Contributing
+------------
+
+If you are interested in the development of Maven, please consult the 
+documentation first and afterwards you are welcome to join the developers 
+mailing list to ask question or discuss new ideas / features / bugs etc.
 
-Run Maven, specifying a location into which the completed Maven distro should be installed:
+Take a look into the [contribution guidelines](CONTRIBUTING.md).
 
+License
+-------
+This code is under the [Apache Licence v2][license]
+
+See the `NOTICE` file for required notices and attributions.
+
+Donations
+---------
+You like Apache Maven? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development.
+
+License
+-------
+[Apache License, Version 2.0, January 2004][license]
+
+Quick Build
+-------
+If you want to bootstrap Maven, you'll need:
+- Java 1.7+
+- Maven 3.0.5 or later
+- Run Maven, specifying a location into which the completed Maven distro should be installed:
 ```
 mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean package
 ```
 
-Once the build completes, you should have a new Maven distro ready to roll in that directory!
+
+[home]: https://maven.apache.org/
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[build]: https://builds.apache.org/job/maven-box/job/maven/job/master/
+[test-results]: https://builds.apache.org/job/maven-box/job/maven/job/master/lastCompletedBuild/testReport/
+[build-status]: https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven/job/master.svg?style=flat-square
+[build-tests]: https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven/job/master.svg?style=flat-square
+[maven-home]: https://maven.apache.org/
+[maven-download]: https://maven.apache.org/download.cgi
+[users-list]: https://maven.apache.org/mail-lists.html
+[dev-ml-list]: https://www.mail-archive.com/dev@maven.apache.org/
+[code-style]: http://maven.apache.org/developers/conventions/code.html
+[core-it]: https://maven.apache.org/core-its/core-it-suite/
+[building-maven]: https://maven.apache.org/guides/development/guide-building-maven.html
+[cla]: https://www.apache.org/licenses/#clas
+

apache-maven/README.txt

@@ -73,7 +73,7 @@
   Downloads:          https://maven.apache.org/download.html
   Release Notes:      https://maven.apache.org/docs/history.html
   Mailing Lists:      https://maven.apache.org/mail-lists.html
-  Source Code:        https://git-wip-us.apache.org/repos/asf/maven.git
+  Source Code:        https://gitbox.apache.org/repos/asf/maven.git
   Issue Tracking:     https://issues.apache.org/jira/browse/MNG
   Wiki:               https://cwiki.apache.org/confluence/display/MAVEN/
-  Available Plugins:  https://maven.apache.org/plugins/index.html
+  Available Plugins:  https://maven.apache.org/plugins/

apache-maven/pom.xml

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

debian/changelog

+maven (3.5.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Install the bash-completion script /usr/share/bash-completion/completions/
+    instead of /etc/bash_completion.d/
+  * Generate Java 8 compatible bytecode
+  * Removed the qdox patch (fixed upstream)
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 05 Oct 2018 11:15:23 +0200
+
 maven (3.5.3-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -2,9 +2,13 @@ Source: maven
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Emmanuel Bourg <ebourg@apache.org>, Stephen Kitt <skitt@debian.org>
-Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper
-Build-Depends-Indep: junit4,
+Uploaders:
+ Emmanuel Bourg <ebourg@apache.org>,
+ Stephen Kitt <skitt@debian.org>
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ junit4,
  libcommons-cli-java (>= 1.4),
  libcommons-jxpath-java,
  libcommons-lang3-java (>= 3.4-2~),
@@ -32,8 +36,9 @@ Build-Depends-Indep: junit4,
  libwagon-http-java,
  libwagon-http-shaded-java,
  libwagon-provider-api-java,
-                     libxmlunit-java
-Standards-Version: 4.1.4
+ libxmlunit-java,
+ maven-debian-helper
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/maven.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven
 Homepage: http://maven.apache.org
@@ -64,9 +69,10 @@ Description: Core libraries for Maven 3
 
 Package: maven
 Architecture: all
-Depends: default-jre-headless (>= 2:1.7) | java7-runtime-headless,
-         libmaven3-core-java (= ${source:Version}),
+Depends:
+ default-jre-headless (>= 2:1.7) | java7-runtime-headless,
  libjansi-java,
+ libmaven3-core-java (= ${source:Version}),
  libwagon-file-java,
  libwagon-http-shaded-java,
  ${misc:Depends}

debian/libmaven3-core-java.links

@@ -7,7 +7,7 @@
 /usr/share/java/maven3-model.jar               /usr/share/java/maven-model-3.x.jar
 /usr/share/java/maven3-plugin-api.jar          /usr/share/java/maven-plugin-api-3.x.jar
 /usr/share/java/maven3-repository-metadata.jar /usr/share/java/maven-repository-metadata-3.x.jar
-/usr/share/java/maven3-resolver-provider.jar   /usr/share/java/maven-resolver-provider-3.x.jar
 /usr/share/java/maven3-resolver-provider.jar   /usr/share/java/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-resolver-provider.jar   /usr/share/java/maven-resolver-provider-3.x.jar
 /usr/share/java/maven3-settings-builder.jar    /usr/share/java/maven-settings-builder-3.x.jar
 /usr/share/java/maven3-settings.jar            /usr/share/java/maven-settings-3.x.jar

debian/maven.install

@@ -4,6 +4,6 @@ apache-maven/src/bin/mvnDebug /usr/share/maven/bin/
 apache-maven/src/bin/mvnyjp   /usr/share/maven/bin/
 apache-maven/src/conf/* /etc/maven
 
-debian/bash_completion.d/maven /etc/bash_completion.d
+debian/bash_completion.d/maven /usr/share/bash-completion/completions/
 debian/mvn.1 usr/share/maven/man/
 debian/mvnDebug.1 usr/share/maven/man/

debian/maven.properties

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

debian/patches/qdox-compatibility.patch

-Description: Workaround for a Qdox regression
-Author: Emmanuel Bourg <ebourg@apache.org>
-Bug-Debian: https://bugs.debian.org/866767
-Bug: https://github.com/paul-hammant/qdox/issues/21
---- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
-+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
-@@ -34,7 +34,7 @@
-  * @author mkleint
-  * @since 2.0.9
-  */
--public abstract class DefaultToolchain // should have been AbstractToolchain...
-+public abstract class DefaultToolchain
-     implements Toolchain, ToolchainPrivate
- {
- 

debian/patches/series

 reproducible-build-timestamp.patch
 slf4j-compatibility.patch
-qdox-compatibility.patch

debian/patches/slf4j-compatibility.patch

@@ -15,7 +15,7 @@ Bug: https://github.com/apache/maven/pull/118
        <groupId>org.apache.maven.shared</groupId>
        <artifactId>maven-shared-utils</artifactId>
      </dependency>
-@@ -49,52 +54,35 @@
+@@ -49,48 +54,31 @@
  
    <build>
      <plugins>
@@ -82,12 +82,6 @@ Bug: https://github.com/apache/maven/pull/118
              </configuration>
            </execution>
          </executions>
-       </plugin>
-     </plugins>
-   </build>
--</project>
-\ No newline at end of file
-+</project>
 --- a/pom.xml
 +++ b/pom.xml
 @@ -579,6 +579,7 @@

doap_Maven.rdf

@@ -21,18 +21,29 @@ under the License.
     <created>2001</created>
     <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
     <name>Apache Maven</name>
-    <homepage rdf:resource="http://maven.apache.org/"/>
-    <asfext:pmc rdf:resource="http://maven.apache.org/"/>
+    <homepage rdf:resource="https://maven.apache.org/"/>
+    <asfext:pmc rdf:resource="https://maven.apache.org/"/>
     <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="http://maven.apache.org/mail-lists.html"/>
-    <download-page rdf:resource="http://maven.apache.org/download.html"/>
+    <mailing-list rdf:resource="https://maven.apache.org/mail-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-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>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.tar.gz</file-release>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.3/source/apache-maven-3.5.3-src.zip</file-release>
+        <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.3/source/apache-maven-3.5.3-src.tar.gz</file-release>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache Maven 3.5.3</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>
@@ -219,14 +230,14 @@ under the License.
     </release>
     <repository>
       <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/maven.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf/maven.git"/>
+        <location rdf:resource="https://gitbox.apache.org/repos/asf/maven.git"/>
+        <browse rdf:resource="https://gitbox.apache.org/repos/asf/maven.git"/>
       </GitRepository>
     </repository>
     <repository>
       <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+        <location rdf:resource="https://gitbox.apache.org/repos/asf/maven-integration-testing.git"/>
+        <browse rdf:resource="https://gitbox.apache.org/repos/asf/maven-integration-testing.git"/>
       </GitRepository>
     </repository>
     <maintainer>

maven-artifact/pom.xml

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

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

@@ -46,7 +46,7 @@ public interface Artifact
 
     String SNAPSHOT_VERSION = "SNAPSHOT";
 
-    Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
+    Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$" );
 
     // TODO into artifactScope handler
 

maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java → maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java

@@ -49,6 +49,7 @@ public void testIsSnapshot()
         assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-SNAPSHOT" ) );
         assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-snapshot" ) );
         assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-20090413.094722-2" ) );
+        assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3-20090413X094722-2"));
     }
 
     public void testToSnapshotVersion()
@@ -56,6 +57,7 @@ public void testToSnapshotVersion()
         assertEquals( "1.2.3", ArtifactUtils.toSnapshotVersion( "1.2.3" ) );
         assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-SNAPSHOT" ) );
         assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413.094722-2" ) );
+        assertEquals( "1.2.3-20090413X094722-2", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413X094722-2" ) );
     }
 
     /**