.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/MDEP) 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 `[MDEP-XXX] - Fixes bug in ApproximateQuantiles`,
+       where you replace `MDEP-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 integration tests successfully (`mvn -Prun-its clean verify`).
+
+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).
+

.gitignore

+target/
+.project
+.classpath
+.settings/
+.svn/
+bin/
+# Intellij
+*.ipr
+*.iml
+.idea
+out/
+.DS_Store
+/bootstrap
+/dependencies.xml
+.java-version

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 Dependency Plugin
+======================
+
+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.
+```
+[MDEP-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/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 Help JIRA project page](https://issues.apache.org/jira/projects/MDEP/)
++ [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

Jenkinsfile

+/**
+ * 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.
+ */
+
+asfMavenTlpStdBuild()

README.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 Dependency Plugin
+======================
+
+[![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.plugins/maven-dependency-plugin.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven.plugins%22%20AND%20a%3A%22maven-dependency-plugin%22)
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-dependency-plugin/job/master.svg?style=flat-square)][build]
+[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-dependency-plugin/job/master.svg?style=flat-square)][test-results]
+
+
+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.
+
+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.
+```
+[MDEP-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/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 Dependency JIRA project page](https://issues.apache.org/jira/projects/MDEP/)
++ [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
+
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[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
+[test-results]: https://builds.apache.org/job/maven-box/job/maven-dependency-plugin/job/master/lastCompletedBuild/testReport/
+[build]: https://builds.apache.org/job/maven-box/job/maven-dependency-plugin/job/master/

debian/changelog

+maven-dependency-plugin (3.1.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jul 2018 11:53:06 +0200
+
 maven-dependency-plugin (3.0.1-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  junit4,
  libcommons-collections3-java,
@@ -24,9 +24,9 @@ Build-Depends:
  libplexus-utils2-java,
  libwagon-http-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-dependency-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-dependency-plugin.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/maven-dependency-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-dependency-plugin
 Homepage: http://maven.apache.org/plugins/maven-dependency-plugin/
 
 Package: libmaven-dependency-plugin-java

debian/copyright

@@ -6,12 +6,14 @@ Upstream-Contact:  Brian Fox <brianf@apache.org> as Lead Developer
 Source: http://maven.apache.org/plugins/maven-dependency-plugin/
 
 Files: *
-Copyright: 2001-2013, The Apache Software Foundation.
+Copyright: 2001-2018, The Apache Software Foundation.
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2009, Ludovic Claude <ludovic.claude@laposte.net>
            2011, Torsten Werner <twerner@debian.org>
+           2013-2018, Emmanuel Bourg <ebourg@apache.org>
+           2017, Markus Koschany <apo@debian.org>
 License: GPL-3+
 
 License: Apache-2.0

debian/orig-tar.sh

-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-dependency-plugin_$VERSION.orig.tar.xz
-DIR=maven-dependency-plugin-$VERSION
-TAG=$(echo "maven-dependency-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG}/ $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi

debian/patches/05-aether-compatibility.patch

@@ -13,7 +13,7 @@ Forwarded: no
  
  /**
   * @author brianf
-@@ -86,7 +85,8 @@
+@@ -85,7 +84,8 @@
          buildingRequest = session.getProjectBuildingRequest();
  
          DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
@@ -21,8 +21,8 @@ Forwarded: no
 +        org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
 +        repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
  
- 
      }
+ 
 --- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
 +++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
 @@ -27,8 +27,7 @@
@@ -40,12 +40,12 @@ Forwarded: no
          DefaultRepositorySystemSession repoSession =
              (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
 -        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
-+        org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
++        org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( testDir.getAbsolutePath() );
 +        repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
  
          setVariableValueToObject( mojo, "session", legacySupport.getSession() );
      }
-@@ -91,8 +91,11 @@
+@@ -92,8 +92,11 @@
          mojo.setGroupId( "org.apache.maven" );
          mojo.setArtifactId( "maven-model" );
          mojo.setVersion( "2.0.9" );
@@ -136,7 +136,7 @@ Forwarded: no
  
  public class TestBuildClasspathMojo
      extends AbstractDependencyMojoTestCase
-@@ -124,7 +123,8 @@
+@@ -125,7 +124,8 @@
          setVariableValueToObject( mojo, "session", session );
  
          DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink

debian/watch

-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-http://svn.apache.org/repos/asf/maven/plugins/tags/ \
-  maven-dependency-plugin-(\d.*)/ debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz,uversionmangle=s/-(alpha|beta|M)-/~$1/" \
+https://github.com/apache/maven-dependency-plugin/tags .*/maven-dependency-plugin-([\d\.]+).tar.gz

pom.xml

@@ -25,12 +25,12 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>30</version>
+    <version>31</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
   <artifactId>maven-dependency-plugin</artifactId>
-  <version>3.0.1</version>
+  <version>3.1.1</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Dependency Plugin</name>
@@ -41,14 +41,19 @@ under the License.
   </prerequisites>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-3.0.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-3.0.1</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-3.0.1</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git</developerConnection>
+    <url>https://github.com/apache/maven-dependency-plugin/tree/${project.scm.tag}</url>
+    <tag>maven-dependency-plugin-3.1.1</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
     <url>https://issues.apache.org/jira/browse/MDEP</url>
   </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/maven-box/job/maven-dependency-plugin/</url>
+  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -84,6 +89,7 @@ under the License.
     <mavenVersion>3.0</mavenVersion>
     <doxiaVersion>1.4</doxiaVersion>
     <pluginTestingVersion>2.1</pluginTestingVersion>
+    <javaVersion>7</javaVersion>
   </properties>
 
   <dependencies>
@@ -173,17 +179,17 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>3.4</version>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.24</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>file-management</artifactId>
-      <version>1.2.1</version>
+      <version>3.0.0</version>
       <exclusions>
         <exclusion>
           <artifactId>maven-artifact-manager</artifactId>
@@ -194,14 +200,14 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.4</version>
+      <version>3.0.0</version>
     </dependency>
 
     <!-- shared -->
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-dependency-analyzer</artifactId>
-      <version>1.7</version>
+      <version>1.10</version>
       <exclusions>
         <exclusion>
           <artifactId>maven-project</artifactId>
@@ -224,6 +230,11 @@ under the License.
       <artifactId>maven-artifact-transfer</artifactId>
       <version>0.9.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>3.2.0</version>
+    </dependency>
 
     <dependency>
       <groupId>commons-lang</groupId>
@@ -312,6 +323,11 @@ under the License.
             </excludes>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>3.5</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -328,9 +344,11 @@ under the License.
               <rules>
                 <enforceBytecodeVersion>
                   <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                  <ignoreClasses>
+                    <ignoreClass>module-info</ignoreClass>
+                  </ignoreClasses>
                 </enforceBytecodeVersion>
               </rules>
-              <fail>true</fail>
             </configuration>
           </execution>
         </executions>
@@ -338,6 +356,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.21.0</version>
         <configuration>
           <!-- Need of more heap space in order to run the unit tests !-->
           <argLine>-Xmx384m</argLine>

src/it/projects/analyze-report/pom.xml

@@ -60,9 +60,6 @@
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <usedDependencies>
-              <usedDependency>org.apache.maven:maven-artifact</usedDependency>
-            </usedDependencies>
            <outputXML>true</outputXML>
            <scriptableOutput>true</scriptableOutput>
            <verbose>true</verbose>

src/it/projects/analyze/pom.xml

@@ -60,9 +60,6 @@
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <usedDependencies>
-              <usedDependency>org.apache.maven:maven-artifact</usedDependency>
-            </usedDependencies>
            <outputXML>true</outputXML>
            <scriptableOutput>true</scriptableOutput>
            <verbose>true</verbose>