.gitignore

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

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()

debian/changelog

+maven-dependency-analyzer (1.10-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+    - Depend on libasm-java (>= 6.0)
+  * 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:22:19 +0200
+
 maven-dependency-analyzer (1.7-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude@laposte.net>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  junit4,
- libasm-java (>= 5.0),
+ libasm-java (>= 6.0),
  libjmock-java,
  libmaven-plugin-testing-java,
  libmaven-plugin-tools-java,
@@ -15,9 +15,9 @@ Build-Depends:
  libplexus-component-metadata-java (>= 1.6),
  libplexus-utils-java,
  maven-debian-helper
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-dependency-analyzer.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-dependency-analyzer.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/maven-dependency-analyzer.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-dependency-analyzer
 Homepage: http://maven.apache.org/shared/maven-dependency-analyzer/
 
 Package: libmaven-dependency-analyzer-java

debian/copyright

@@ -4,13 +4,13 @@ Upstream-Contact: Apache Maven team
 Source: http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/
 
 Files: *
-Copyright: 2001-2015, 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-2017, Emmanuel Bourg <ebourg@apache.org>
+           2013-2018, Emmanuel Bourg <ebourg@apache.org>
 License: GPL-3+
 
 License: Apache-2.0

debian/maven.ignoreRules

+org.apache.maven.plugins maven-enforcer-plugin

debian/orig-tar.sh

-#!/bin/sh -e
-
-TAR=../maven-dependency-analyzer_$2.orig.tar.xz
-DIR=maven-dependency-analyzer-$2
-TAG=maven-dependency-analyzer-$2
-
-svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR
-XZ_OPT=--best tar -c -J -f $TAR $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/01-ignore-plugin-version.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -141,7 +141,6 @@
+@@ -164,7 +164,6 @@
        <plugin>
          <groupId>org.codehaus.plexus</groupId>
          <artifactId>plexus-component-metadata</artifactId>

debian/rules

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

debian/watch

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

pom.xml

@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>30</version>
+    <version>31</version>
     <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
   </parent>
 
   <artifactId>maven-dependency-analyzer</artifactId>
   <packaging>jar</packaging>
-  <version>1.7</version>
+  <version>1.10</version>
 
   <name>Apache Maven Dependency Analyzer</name>
   <description>
@@ -38,14 +38,19 @@
   </description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.7</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.7</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.7</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git</developerConnection>
+    <url>https://github.com/apache/maven-dependency-analyzer/tree/${project.scm.tag}</url>
+    <tag>maven-dependency-analyzer-1.10</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
     <url>https://issues.apache.org/jira/browse/MSHARED/component/12326428</url>
   </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/maven-box/job/maven-dependency-analyzer/</url>
+  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -55,6 +60,7 @@
 
   <properties>
     <mavenVersion>2.0.5</mavenVersion>
+    <javaVersion>7</javaVersion>
   </properties>
 
   <dependencyManagement>
@@ -70,12 +76,12 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>5.0.2</version>
+      <version>6.1.1</version>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -125,6 +131,24 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <ignoreClasses>
+                    <ignoreClass>module-info</ignoreClass>
+                  </ignoreClasses>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

src/main/java/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.java

@@ -27,7 +27,7 @@ import java.util.Set;
  * Gets the set of classes contained in a library given either as a jar file or an exploded directory.
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: ClassAnalyzer.java 1174427 2011-09-22 22:25:17Z hboutemy $
+ * @version $Id$
  */
 public interface ClassAnalyzer
 {

src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitor.java

@@ -25,7 +25,7 @@ import java.io.InputStream;
  * 
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: ClassFileVisitor.java 661727 2008-05-30 14:21:49Z bentmann $
+ * @version $Id$
  */
 public interface ClassFileVisitor
 {

src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java

@@ -36,7 +36,7 @@ import java.util.jar.JarInputStream;
  * Utility to visit classes in a library given either as a jar file or an exploded directory.
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: ClassFileVisitorUtils.java 1589261 2014-04-22 19:34:38Z mfriedenhagen $
+ * @version $Id$
  */
 public final class ClassFileVisitorUtils
 {
@@ -102,7 +102,8 @@ public final class ClassFileVisitorUtils
             {
                 String name = entry.getName();
 
-                if ( name.endsWith( ".class" ) )
+                // ignore files like package-info.class and module-info.class
+                if ( name.endsWith( ".class" ) && name.indexOf( '-' ) == -1 )
                 {
                     visitClass( name, in, visitor );
                 }

src/main/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.java

@@ -27,7 +27,7 @@ import java.util.Set;
  * Simply collects the set of visited classes.
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: CollectorClassFileVisitor.java 1174427 2011-09-22 22:25:17Z hboutemy $
+ * @version $Id$
  * @see #getClasses()
  */
 public class CollectorClassFileVisitor

src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java

@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.annotations.Component;
  *
  *
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: DefaultClassAnalyzer.java 1635410 2014-10-30 07:03:49Z hboutemy $
+ * @version $Id$
  */
 @Component( role = ClassAnalyzer.class )
 public class DefaultClassAnalyzer

src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java

@@ -39,7 +39,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: DefaultProjectDependencyAnalyzer.java 1791601 2017-04-16 11:13:17Z michaelo $
+ * @version $Id$
  */
 @Component( role = ProjectDependencyAnalyzer.class )
 public class DefaultProjectDependencyAnalyzer

src/main/java/org/apache/maven/shared/dependency/analyzer/DependencyAnalyzer.java

@@ -27,7 +27,7 @@ import java.util.Set;
  * Gets the set of classes referenced by a library given either as a jar file or an exploded directory.
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: DependencyAnalyzer.java 1174427 2011-09-22 22:25:17Z hboutemy $
+ * @version $Id$
  */
 public interface DependencyAnalyzer
 {

src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java

@@ -32,7 +32,7 @@ import org.apache.maven.artifact.Artifact;
  * Project dependencies analysis result.
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @version $Id: ProjectDependencyAnalysis.java 1635410 2014-10-30 07:03:49Z hboutemy $
+ * @version $Id$
  */
 public class ProjectDependencyAnalysis
 {
@@ -63,6 +63,7 @@ public class ProjectDependencyAnalysis
 
     /**
      * Used and declared artifacts.
+     * @return {@link Artifact}
      */
     public Set<Artifact> getUsedDeclaredArtifacts()
     {
@@ -71,6 +72,7 @@ public class ProjectDependencyAnalysis
 
     /**
      * Used but not declared artifacts.
+     * @return {@link Artifact}
      */
     public Set<Artifact> getUsedUndeclaredArtifacts()
     {
@@ -79,6 +81,7 @@ public class ProjectDependencyAnalysis
 
     /**
      * Unused but declared artifacts.
+     * @return {@link Artifact}
      */
     public Set<Artifact> getUnusedDeclaredArtifacts()
     {