diff -Nru maven-clean-plugin-3.0.0/debian/changelog maven-clean-plugin-3.1.0/debian/changelog
--- maven-clean-plugin-3.0.0/debian/changelog	2017-08-22 22:46:40.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/changelog	2018-07-30 10:58:29.000000000 +0000
@@ -1,3 +1,14 @@
+maven-clean-plugin (3.1.0-1) unstable; urgency=medium
+
+  * New upstream release
+    - Removed 01-junit-dependency.patch (fixed upstream)
+  * 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 12:58:29 +0200
+
 maven-clean-plugin (3.0.0-2) unstable; urgency=medium
 
   * Added the missing build dependency on junit4 (Closes: #871148)
diff -Nru maven-clean-plugin-3.0.0/debian/compat maven-clean-plugin-3.1.0/debian/compat
--- maven-clean-plugin-3.0.0/debian/compat	2017-06-20 12:58:10.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/compat	2018-07-30 10:54:21.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru maven-clean-plugin-3.0.0/debian/control maven-clean-plugin-3.1.0/debian/control
--- maven-clean-plugin-3.0.0/debian/control	2017-08-22 22:46:10.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/control	2018-07-30 10:54:21.000000000 +0000
@@ -7,7 +7,7 @@
  Ludovic Claude <ludovic.claude@laposte.net>,
  Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  junit4,
  libmaven-file-management-java,
@@ -16,9 +16,9 @@
  libmaven3-core-java,
  libplexus-utils-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-clean-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-clean-plugin.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/maven-clean-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-clean-plugin
 Homepage: http://maven.apache.org/plugins/maven-clean-plugin/
 
 Package: libmaven-clean-plugin-java
diff -Nru maven-clean-plugin-3.0.0/debian/copyright maven-clean-plugin-3.1.0/debian/copyright
--- maven-clean-plugin-3.0.0/debian/copyright	2017-06-20 12:58:10.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/copyright	2018-07-30 10:58:26.000000000 +0000
@@ -1,14 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Clean Plugin
-Upstream-Contact:  Jesse McConnell as
-Source: http://maven.apache.org/plugins/maven-clean-plugin/
+Source: https://maven.apache.org/plugins/maven-clean-plugin/
 
 Files: *
-Copyright: 2001-2011, The Apache Software Foundation.
+Copyright: 2001-2018, The Apache Software Foundation.
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2008-2011, Torsten Werner <twerner@debian.org>
+           2009, Ludovic Claude <ludovic.claude@laposte.net>
+           2012, Miguel Landaeta <miguel@miguel.cc>
+           2013-2018, Emmanuel Bourg <ebourg@apache.org>
 License: Apache-2.0
 
 License: Apache-2.0
diff -Nru maven-clean-plugin-3.0.0/debian/orig-tar.sh maven-clean-plugin-3.1.0/debian/orig-tar.sh
--- maven-clean-plugin-3.0.0/debian/orig-tar.sh	2017-06-20 12:58:10.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/orig-tar.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-clean-plugin_$VERSION.orig.tar.xz
-DIR=maven-clean-plugin-$VERSION
-TAG=$(echo "maven-clean-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
diff -Nru maven-clean-plugin-3.0.0/debian/patches/01-junit-dependency.patch maven-clean-plugin-3.1.0/debian/patches/01-junit-dependency.patch
--- maven-clean-plugin-3.0.0/debian/patches/01-junit-dependency.patch	2017-08-22 22:45:42.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/patches/01-junit-dependency.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-Description: Adds an explicit dependency on junit
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
-@@ -84,6 +84,12 @@
- 
-     <!-- Test -->
-     <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.12</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-       <groupId>org.apache.maven.plugin-testing</groupId>
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <version>2.1</version>
diff -Nru maven-clean-plugin-3.0.0/debian/patches/series maven-clean-plugin-3.1.0/debian/patches/series
--- maven-clean-plugin-3.0.0/debian/patches/series	2017-08-22 22:41:08.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-01-junit-dependency.patch
diff -Nru maven-clean-plugin-3.0.0/debian/rules maven-clean-plugin-3.1.0/debian/rules
--- maven-clean-plugin-3.0.0/debian/rules	2017-07-17 13:15:33.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/rules	2018-07-30 10:54:21.000000000 +0000
@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download
diff -Nru maven-clean-plugin-3.0.0/debian/watch maven-clean-plugin-3.1.0/debian/watch
--- maven-clean-plugin-3.0.0/debian/watch	2017-06-20 12:58:10.000000000 +0000
+++ maven-clean-plugin-3.1.0/debian/watch	2018-07-30 10:54:21.000000000 +0000
@@ -1,4 +1,3 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-http://svn.apache.org/repos/asf/maven/plugins/tags/ \
-  maven-clean-plugin-(\d.*)/ debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz,uversionmangle=s/-(alpha|beta|M)-/~$1/" \
+https://github.com/apache/maven-clean-plugin/tags .*/maven-clean-plugin-([\d\.]+).tar.gz
diff -Nru maven-clean-plugin-3.0.0/.gitignore maven-clean-plugin-3.1.0/.gitignore
--- maven-clean-plugin-3.0.0/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ maven-clean-plugin-3.1.0/.gitignore	2018-04-08 13:35:56.000000000 +0000
@@ -0,0 +1,15 @@
+target/
+.project
+.classpath
+.settings/
+.svn/
+bin/
+# Intellij
+*.ipr
+*.iml
+.idea
+out/
+.DS_Store
+/bootstrap
+/dependencies.xml
+.java-version
diff -Nru maven-clean-plugin-3.0.0/Jenkinsfile maven-clean-plugin-3.1.0/Jenkinsfile
--- maven-clean-plugin-3.0.0/Jenkinsfile	1970-01-01 00:00:00.000000000 +0000
+++ maven-clean-plugin-3.1.0/Jenkinsfile	2018-04-08 13:35:56.000000000 +0000
@@ -0,0 +1,20 @@
+/**
+ * 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()
diff -Nru maven-clean-plugin-3.0.0/pom.xml maven-clean-plugin-3.1.0/pom.xml
--- maven-clean-plugin-3.0.0/pom.xml	2015-10-19 07:14:00.000000000 +0000
+++ maven-clean-plugin-3.1.0/pom.xml	2018-04-08 13:35:56.000000000 +0000
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>28</version>
-    <relativePath>../maven-plugins/pom.xml</relativePath>
+    <version>31</version>
+    <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
   <artifactId>maven-clean-plugin</artifactId>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Clean Plugin</name>
@@ -44,14 +44,19 @@
   </prerequisites>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-3.0.0</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-3.0.0</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-clean-plugin-3.0.0</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-clean-plugin.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-clean-plugin.git</developerConnection>
+    <url>https://github.com/apache/maven-clean-plugin/tree/${project.scm.tag}</url>
+    <tag>maven-clean-plugin-3.1.0</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
     <url>https://issues.apache.org/jira/browse/MCLEAN</url>
   </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/maven-box/job/maven-clean-plugin/</url>
+  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -61,6 +66,8 @@
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
+    <surefire.version>2.21.0</surefire.version>
+    <javaVersion>7</javaVersion>
   </properties>
 
   <dependencies>
@@ -72,7 +79,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <version>3.0.0</version>
+      <version>3.2.1</version>
     </dependency>
 
     <!-- dependencies to annotations -->
@@ -101,6 +108,12 @@
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
Binary files /tmp/tmpJ2Zgpc/AsXHf3daCP/maven-clean-plugin-3.0.0/src/it/default/target/test-1.0-SNAPSHOT.jar and /tmp/tmpJ2Zgpc/lVSJ1HBUCA/maven-clean-plugin-3.1.0/src/it/default/target/test-1.0-SNAPSHOT.jar differ
Binary files /tmp/tmpJ2Zgpc/AsXHf3daCP/maven-clean-plugin-3.0.0/src/it/exclude-default-dirs/target/test-1.0-SNAPSHOT.jar and /tmp/tmpJ2Zgpc/lVSJ1HBUCA/maven-clean-plugin-3.1.0/src/it/exclude-default-dirs/target/test-1.0-SNAPSHOT.jar differ
Binary files /tmp/tmpJ2Zgpc/AsXHf3daCP/maven-clean-plugin-3.0.0/src/it/only-test-clean/target/test-1.0-SNAPSHOT.jar and /tmp/tmpJ2Zgpc/lVSJ1HBUCA/maven-clean-plugin-3.1.0/src/it/only-test-clean/target/test-1.0-SNAPSHOT.jar differ
diff -Nru maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/Cleaner.java maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/Cleaner.java
--- maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/Cleaner.java	2015-09-26 12:30:18.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/Cleaner.java	2018-04-08 13:35:56.000000000 +0000
@@ -50,7 +50,7 @@
      * @param log The logger to use, may be <code>null</code> to disable logging.
      * @param verbose Whether to perform verbose logging.
      */
-    public Cleaner( final Log log, boolean verbose )
+    Cleaner( final Log log, boolean verbose )
     {
         logDebug = ( log == null || !log.isDebugEnabled() ) ? null : new Logger()
         {
diff -Nru maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java
--- maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java	2015-09-26 12:30:18.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java	2018-04-08 13:35:56.000000000 +0000
@@ -29,20 +29,18 @@
 
 /**
  * Goal which cleans the build.
- * <p/>
- * <P>
+ * <p>
  * This attempts to clean a project's working directory of the files that were generated at build-time. By default, it
  * discovers and deletes the directories configured in <code>project.build.directory</code>,
  * <code>project.build.outputDirectory</code>, <code>project.build.testOutputDirectory</code>, and
  * <code>project.reporting.outputDirectory</code>.
- * </P>
- * <p/>
- * <P>
+ * </p>
+ * <p>
  * Files outside the default may also be included in the deletion by configuring the <code>filesets</code> tag.
- * </P>
+ * </p>
  *
  * @author <a href="mailto:evenisse@maven.org">Emmanuel Venisse</a>
- * @version $Id: CleanMojo.java 1705442 2015-09-26 12:30:18Z khmarbaise $
+ * @version $Id$
  * @see org.apache.maven.plugins.clean.Fileset
  * @since 2.0
  */
diff -Nru maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/Fileset.java maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/Fileset.java
--- maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/Fileset.java	2015-09-26 12:30:18.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/Fileset.java	2018-04-08 13:35:56.000000000 +0000
@@ -29,7 +29,7 @@
  * <code>"file-set: <I>[directory]</I> (included: <I>[included files]</I>,
  * excluded: <I>[excluded files]</I>)"</code>
  *
- * @version $Id: Fileset.java 1705442 2015-09-26 12:30:18Z khmarbaise $
+ * @version $Id$
  * @since 2.1
  */
 public class Fileset
diff -Nru maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/GlobSelector.java maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/GlobSelector.java
--- maven-clean-plugin-3.0.0/src/main/java/org/apache/maven/plugins/clean/GlobSelector.java	2015-09-26 12:30:18.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/main/java/org/apache/maven/plugins/clean/GlobSelector.java	2018-04-08 13:35:56.000000000 +0000
@@ -41,12 +41,12 @@
 
     private final String str;
 
-    public GlobSelector( String[] includes, String[] excludes )
+    GlobSelector( String[] includes, String[] excludes )
     {
         this( includes, excludes, false );
     }
 
-    public GlobSelector( String[] includes, String[] excludes, boolean useDefaultExcludes )
+    GlobSelector( String[] includes, String[] excludes, boolean useDefaultExcludes )
     {
         this.str = "includes = " + toString( includes ) + ", excludes = " + toString( excludes );
         this.includes = normalizePatterns( includes );
diff -Nru maven-clean-plugin-3.0.0/src/site/apt/index.apt.vm maven-clean-plugin-3.1.0/src/site/apt/index.apt.vm
--- maven-clean-plugin-3.0.0/src/site/apt/index.apt.vm	2013-09-22 11:00:52.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/site/apt/index.apt.vm	2018-04-08 13:35:56.000000000 +0000
@@ -45,9 +45,7 @@
 * Usage
 
   General instructions on how to use the Clean Plugin can be found on the {{{./usage.html}usage page}}. Some more
-  specific use cases are described in the examples given below. Last but not least, users occasionally contribute
-  additional examples, tips or errata to the
-  {{{http://docs.codehaus.org/display/MAVENUSER/Clean+Plugin}plugin's wiki page}}.
+  specific use cases are described in the examples given below.
 
   In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
   free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
diff -Nru maven-clean-plugin-3.0.0/src/site/site.xml maven-clean-plugin-3.1.0/src/site/site.xml
--- maven-clean-plugin-3.0.0/src/site/site.xml	2014-05-11 16:14:19.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/site/site.xml	2018-04-08 13:35:56.000000000 +0000
@@ -28,7 +28,7 @@
       <item name="Goals" href="plugin-info.html"/>
       <item name="Usage" href="usage.html"/>
       <item name="FAQ" href="faq.html"/>
-      <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+      <!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
       <item name="License" href="http://www.apache.org/licenses/"/>
       <item name="Download" href="download.html"/>
     </menu>
diff -Nru maven-clean-plugin-3.0.0/src/site/xdoc/download.xml.vm maven-clean-plugin-3.1.0/src/site/xdoc/download.xml.vm
--- maven-clean-plugin-3.0.0/src/site/xdoc/download.xml.vm	2015-06-19 22:37:34.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/site/xdoc/download.xml.vm	2018-04-08 13:35:56.000000000 +0000
@@ -108,7 +108,7 @@
           <tr>
             <td>${project.name} ${project.version} (Source zip)</td>
             <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
-            <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+            <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1</a></td>
             <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
           </tr>
         </tbody>
diff -Nru maven-clean-plugin-3.0.0/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java maven-clean-plugin-3.1.0/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
--- maven-clean-plugin-3.0.0/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java	2015-09-26 12:30:18.000000000 +0000
+++ maven-clean-plugin-3.1.0/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java	2018-04-08 13:35:56.000000000 +0000
@@ -33,7 +33,7 @@
  * Test the clean mojo.
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id: CleanMojoTest.java 1705442 2015-09-26 12:30:18Z khmarbaise $
+ * @version $Id$
  */
 public class CleanMojoTest
     extends AbstractMojoTestCase
@@ -55,7 +55,7 @@
     /**
      * Tests the simple removal of directories
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testBasicClean()
         throws Exception
@@ -82,7 +82,7 @@
     /**
      * Tests the removal of files and nested directories
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testCleanNestedStructure()
         throws Exception
@@ -107,7 +107,7 @@
      * Tests that no exception is thrown when all internal variables are empty and that it doesn't
      * just remove whats there
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testCleanEmptyDirectories()
         throws Exception
@@ -135,7 +135,7 @@
     /**
      * Tests the removal of files using fileset
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testFilesetsClean()
         throws Exception
@@ -171,7 +171,7 @@
     /**
      * Tests the removal of a directory as file
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testCleanInvalidDirectory()
         throws Exception
@@ -200,7 +200,7 @@
     /**
      * Tests the removal of a missing directory
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testMissingDirectory()
         throws Exception
@@ -221,10 +221,11 @@
 
     /**
      * Test the removal of a locked file on Windows systems.
-     * <br/>
+     * <p>
      * Note: Unix systems doesn't lock any files.
+     * </p>
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testCleanLockedFile()
         throws Exception
@@ -276,10 +277,11 @@
 
     /**
      * Test the removal of a locked file on Windows systems.
-     * <br/>
+     * <p>
      * Note: Unix systems doesn't lock any files.
+     * </p>
      *
-     * @throws Exception
+     * @throws Exception in case of an error.
      */
     public void testCleanLockedFileWithNoError()
         throws Exception