debian/changelog

+maven-common-artifact-filters (3.0.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the dependency on libaether-java
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 05 Jun 2018 15:09:36 +0200
+
 maven-common-artifact-filters (3.0.1-2) unstable; urgency=medium
 
   * Team upload.
@@ -71,4 +81,3 @@ maven-common-artifact-filters (1.1-1) experimental; urgency=low
   * Initial release. (Closes: #536639)
 
  -- Ludovic Claude <ludovic.claude@laposte.net>  Sun, 07 Jun 2009 00:04:41 +0100
-

debian/compat

-10
+11

debian/control

@@ -4,11 +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,
  default-jdk-doc,
  junit4,
- libaether-java,
  libeasymock-java,
  libmaven-javadoc-plugin-java,
  libmaven-plugin-testing-java,
@@ -17,10 +16,10 @@ Build-Depends:
  libplexus-utils-java,
  libplexus-utils-java-doc,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-common-artifact-filters.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-common-artifact-filters.git
-Homepage: http://maven.apache.org/shared/maven-common-artifact-filters/
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/maven-common-artifact-filters.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-common-artifact-filters
+Homepage: https://maven.apache.org/shared/maven-common-artifact-filters/
 
 Package: libmaven-common-artifact-filters-java
 Architecture: all

debian/copyright

-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 Common Artifact Filters
 Upstream-Contact: Apache Maven team
-Source: http://maven.apache.org
+Source: https://maven.apache.org
 
 Files: *
 Copyright: 2001-2011, The Apache Software Foundation.

debian/maven.ignoreRules

@@ -14,3 +14,4 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
+org.sonatype.aether aether-* * * * *

debian/patches/02-remove-sonatype-aether-dependency.patch

+Description: Removes the dependency on the old Sonatype Aether
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -131,4 +131,22 @@
+       <scope>test</scope>
+     </dependency>
+   </dependencies>
++
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <excludes>
++            <exclude>**/Sonatype*</exclude>
++          </excludes>
++          <testExcludes>
++            <testExclude>**/Sonatype*</testExclude>
++          </testExcludes>
++         </configuration>
++      </plugin>
++    </plugins>
++  </build>
++
+ </project>
+--- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
++++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
+@@ -113,40 +113,8 @@
+                     // don't want to pollute method signature with ReflectionExceptions
+                     throw new RuntimeException( e.getMessage(), e );
+                 }
+-            }
+-            else
+-            {
+-                try
+-                {
+-                    @SuppressWarnings( "unchecked" ) List<org.sonatype.aether.graph.Dependency> dependencies =
+-                        (List<org.sonatype.aether.graph.Dependency>) Invoker.invoke( resolutionResult,
+-                                                                                     "getDependencies" );
+-
+-                    for ( org.sonatype.aether.graph.Dependency dependency : dependencies )
+-                    {
+-                        Artifact mavenArtifact = 
+-                                        (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+-                                                                    org.sonatype.aether.artifact.Artifact.class,
+-                                                                    dependency.getArtifact() );
+-
+-                        transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
+-                    }
+-                }
+-                catch ( IllegalAccessException e )
+-                {
+-                    // don't want to pollute method signature with ReflectionExceptions
+-                    throw new RuntimeException( e.getMessage(), e );
+-                }
+-                catch ( InvocationTargetException e )
+-                {
+-                    // don't want to pollute method signature with ReflectionExceptions
+-                    throw new RuntimeException( e.getMessage(), e );
+-                }
+-                catch ( NoSuchMethodException e )
+-                {
+-                    // don't want to pollute method signature with ReflectionExceptions
+-                    throw new RuntimeException( e.getMessage(), e );
+-                }
++            } else {
++                throw new RuntimeException("Unsupported Maven version");
+             }
+         }
+     }

debian/patches/series

+02-remove-sonatype-aether-dependency.patch

debian/rules

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

debian/watch

 version=3
 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-http://svn.apache.org/repos/asf/maven/shared/tags/ \
+https://svn.apache.org/repos/asf/maven/shared/tags/ \
   maven-common-artifact-filters-(\d.*)/ debian debian/orig-tar.sh