Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-common-artifact-filters
Commits: 1c6de4c4 by Emmanuel Bourg at 2018-06-05T15:07:46+02:00 Removed the dependency on libaether-java - - - - - cf1f0c5b by Emmanuel Bourg at 2018-06-05T15:08:00+02:00 Standards-Version updated to 4.1.4 - - - - - a8ecb106 by Emmanuel Bourg at 2018-06-05T15:08:04+02:00 Switch to debhelper level 11 - - - - - 414dae9b by Emmanuel Bourg at 2018-06-05T15:08:08+02:00 Use salsa.debian.org Vcs-* URLs - - - - - ac0bf1a7 by Emmanuel Bourg at 2018-06-05T15:08:57+02:00 Use secure URLs - - - - - 8dc2833a by Emmanuel Bourg at 2018-06-05T15:11:58+02:00 Upload to unstable - - - - - 9 changed files: - debian/changelog - debian/compat - debian/control - debian/copyright - debian/maven.ignoreRules - + debian/patches/02-remove-sonatype-aether-dependency.patch - + debian/patches/series - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 <ebo...@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.cla...@laposte.net> Sun, 07 Jun 2009 00:04:41 +0100 - ===================================== debian/compat ===================================== --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -4,11 +4,10 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> Uploaders: Ludovic Claude <ludovic.cla...@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 ===================================== --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -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 ===================================== --- a/debian/maven.ignoreRules +++ b/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 ===================================== --- /dev/null +++ b/debian/patches/02-remove-sonatype-aether-dependency.patch @@ -0,0 +1,73 @@ +Description: Removes the dependency on the old Sonatype Aether +Author: Emmanuel Bourg <ebo...@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 ===================================== --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +02-remove-sonatype-aether-dependency.patch ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,3 @@ %: dh $@ - -get-orig-source: - uscan --download-current-version --force-download --rename ===================================== debian/watch ===================================== --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ 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 View it on GitLab: https://salsa.debian.org/java-team/maven-common-artifact-filters/compare/c75f9c0f56b8e7916d41ae20714ed273db0b2925...8dc2833a139dd659adad5f7ea4a76f78bcfde67b -- View it on GitLab: https://salsa.debian.org/java-team/maven-common-artifact-filters/compare/c75f9c0f56b8e7916d41ae20714ed273db0b2925...8dc2833a139dd659adad5f7ea4a76f78bcfde67b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
