[maven] 08/24: Replaced maven-aether-provider with maven-resolver-provider
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 23 21:54:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-3.5
in repository maven.
commit 0f639d772590c56c7d47081803f9734ae73b924e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 17 14:23:27 2017 +0200
Replaced maven-aether-provider with maven-resolver-provider
---
debian/changelog | 1 +
debian/control | 2 +-
debian/libmaven3-core-java.links | 2 +-
debian/libmaven3-core-java.poms | 2 +-
debian/maven.links | 14 +++++++-------
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 586c4b5..3c71c4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven (3.5.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
+ - Replaced maven-aether-provider with maven-resolver-provider
* Build with the DH sequencer instead of CDBS
* Build with maven-debian-helper instead of Ant
* Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 9c01f03..229d516 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper
Build-Depends-Indep: junit4,
- libeclipse-aether-java (>= 1.0),
libcommons-jxpath-java,
libcommons-lang3-java,
libcommons-logging-java,
@@ -13,6 +12,7 @@ Build-Depends-Indep: junit4,
libguice-java (>= 4.0),
liblogback-java,
libmaven-parent-java,
+ libmaven-resolver-java,
libmockito-java,
libmodello-maven-plugin-java (>= 1.8),
libplexus-classworlds2-java (>= 2.4),
diff --git a/debian/libmaven3-core-java.links b/debian/libmaven3-core-java.links
index b9bc612..060fa74 100644
--- a/debian/libmaven3-core-java.links
+++ b/debian/libmaven3-core-java.links
@@ -1,4 +1,3 @@
-/usr/share/java/maven3-aether-provider.jar /usr/share/java/maven-aether-provider-3.x.jar
/usr/share/java/maven3-artifact.jar /usr/share/java/maven-artifact-3.x.jar
/usr/share/java/maven3-builder-support.jar /usr/share/java/maven-builder-support-3.x.jar
/usr/share/java/maven3-compat.jar /usr/share/java/maven-compat-3.x.jar
@@ -8,5 +7,6 @@
/usr/share/java/maven3-model.jar /usr/share/java/maven-model-3.x.jar
/usr/share/java/maven3-plugin-api.jar /usr/share/java/maven-plugin-api-3.x.jar
/usr/share/java/maven3-repository-metadata.jar /usr/share/java/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-resolver-provider.jar /usr/share/java/maven-resolver-provider-3.x.jar
/usr/share/java/maven3-settings-builder.jar /usr/share/java/maven-settings-builder-3.x.jar
/usr/share/java/maven3-settings.jar /usr/share/java/maven-settings-3.x.jar
diff --git a/debian/libmaven3-core-java.poms b/debian/libmaven3-core-java.poms
index ff4d3b2..6244e41 100644
--- a/debian/libmaven3-core-java.poms
+++ b/debian/libmaven3-core-java.poms
@@ -28,7 +28,6 @@
pom.xml --no-parent
apache-maven/pom.xml --ignore
-maven-aether-provider/pom.xml --has-package-version --java-lib --usj-name=maven3-aether-provider
maven-artifact/pom.xml --has-package-version --java-lib --usj-name=maven3-artifact
maven-builder-support/pom.xml --has-package-version --java-lib --usj-name=maven3-builder-support
maven-compat/pom.xml --has-package-version --java-lib --usj-name=maven3-compat
@@ -38,5 +37,6 @@ maven-model/pom.xml --has-package-version --java-lib --usj-name=ma
maven-model-builder/pom.xml --has-package-version --java-lib --usj-name=maven3-model-builder
maven-plugin-api/pom.xml --has-package-version --java-lib --usj-name=maven3-plugin-api
maven-repository-metadata/pom.xml --has-package-version --java-lib --usj-name=maven3-repository-metadata
+maven-resolver-provider/pom.xml --has-package-version --java-lib --usj-name=maven3-resolver-provider
maven-settings/pom.xml --has-package-version --java-lib --usj-name=maven3-settings
maven-settings-builder/pom.xml --has-package-version --java-lib --usj-name=maven3-settings-builder
diff --git a/debian/maven.links b/debian/maven.links
index 1698aef..8f35e11 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -5,12 +5,6 @@
/usr/share/java/plexus-classworlds2.jar /usr/share/maven/boot/plexus-classworlds-2.x.jar
/usr/share/java/aopalliance.jar /usr/share/maven/lib/aopalliance.jar
-/usr/share/java/eclipse-aether-api.jar /usr/share/maven/lib/eclipse-aether-api.jar
-/usr/share/java/eclipse-aether-connector-basic.jar /usr/share/maven/lib/eclipse-aether-connector-basic.jar
-/usr/share/java/eclipse-aether-impl.jar /usr/share/maven/lib/eclipse-aether-impl.jar
-/usr/share/java/eclipse-aether-spi.jar /usr/share/maven/lib/eclipse-aether-spi.jar
-/usr/share/java/eclipse-aether-transport-wagon.jar /usr/share/maven/lib/eclipse-aether-transport-wagon.jar
-/usr/share/java/eclipse-aether-util.jar /usr/share/maven/lib/eclipse-aether-util.jar
/usr/share/java/cdi-api.jar /usr/share/maven/lib/cdi-api.jar
/usr/share/java/commons-cli.jar /usr/share/maven/lib/commons-cli.jar
/usr/share/java/commons-io.jar /usr/share/maven/lib/commons-io.jar
@@ -18,6 +12,12 @@
/usr/share/java/commons-lang3.jar /usr/share/maven/lib/commons-lang3.jar
/usr/share/java/jsoup.jar /usr/share/maven/lib/jsoup.jar
/usr/share/java/atinject-jsr330-tck-1.0.jar /usr/share/maven/lib/javax.inject.jar
+/usr/share/java/maven-resolver-api.jar /usr/share/maven/lib/maven-resolver-api.jar
+/usr/share/java/maven-resolver-connector-basic.jar /usr/share/maven/lib/maven-resolver-connector-basic.jar
+/usr/share/java/maven-resolver-impl.jar /usr/share/maven/lib/maven-resolver-impl.jar
+/usr/share/java/maven-resolver-spi.jar /usr/share/maven/lib/maven-resolver-spi.jar
+/usr/share/java/maven-resolver-transport-wagon.jar /usr/share/maven/lib/maven-resolver-transport-wagon.jar
+/usr/share/java/maven-resolver-util.jar /usr/share/maven/lib/maven-resolver-util.jar
/usr/share/java/plexus-cipher.jar /usr/share/maven/lib/plexus-cipher.jar
/usr/share/java/plexus-component-annotations-1.5.jar /usr/share/maven/lib/plexus-component-annotations.jar
/usr/share/java/plexus-interpolation.jar /usr/share/maven/lib/plexus-interpolation.jar
@@ -30,7 +30,6 @@
/usr/share/java/slf4j-api.jar /usr/share/maven/lib/slf4j-api.jar
/usr/share/java/slf4j-simple.jar /usr/share/maven/lib/slf4j-simple.jar
-/usr/share/java/maven3-aether-provider.jar /usr/share/maven/lib/maven-aether-provider-3.x.jar
/usr/share/java/maven3-artifact.jar /usr/share/maven/lib/maven-artifact-3.x.jar
/usr/share/java/maven3-builder-support.jar /usr/share/maven/lib/maven-builder-support-3.x.jar
/usr/share/java/maven3-compat.jar /usr/share/maven/lib/maven-compat-3.x.jar
@@ -40,6 +39,7 @@
/usr/share/java/maven3-model.jar /usr/share/maven/lib/maven-model-3.x.jar
/usr/share/java/maven3-plugin-api.jar /usr/share/maven/lib/maven-plugin-api-3.x.jar
/usr/share/java/maven3-repository-metadata.jar /usr/share/maven/lib/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-resolver-provider.jar /usr/share/maven/lib/maven-resolver-provider-3.x.jar
/usr/share/java/maven3-settings-builder.jar /usr/share/maven/lib/maven-settings-builder-3.x.jar
/usr/share/java/maven3-settings.jar /usr/share/maven/lib/maven-settings-3.x.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list