[maven] 23/24: Preserve the compatibility with gradle

[Emmanuel Bourg]

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 76b19a978b18eda41389d3e4f1c955550d00f241
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 23 23:46:08 2017 +0200

    Preserve the compatibility with gradle
---
 debian/changelog                 | 1 -
 debian/control                   | 4 ++--
 debian/libmaven3-core-java.links | 1 +
 debian/libmaven3-core-java.poms  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be0fc1a..df981dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ maven (3.5.0-1) UNRELEASED; urgency=medium
     - Depend on libplexus-utils2-java (>= 3.0.24)
     - Depend on libwagon2-java (>= 2.12)
     - Depend on libsisu-plexus-java (>= 0.3.3)
-    - Declare that Maven 3.5.0 breaks gradle (<< 3.2.1-2~)
     - Build depend on libplexus-component-metadata-java (>= 1.7)
     - Build depend on libmodello-maven-plugin-java (>= 1.9.1)
   * Build with the DH sequencer instead of CDBS
diff --git a/debian/control b/debian/control
index 49a665a..c3cd535 100644
--- a/debian/control
+++ b/debian/control
@@ -35,10 +35,10 @@ Homepage: http://maven.apache.org
 
 Package: libmaven3-core-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, libguice-java (>= 4.0)
+Depends: ${misc:Depends}, ${maven:Depends}, libguice-java (>= 4.0), libeclipse-aether-java
 Suggests: ${maven:OptionalDepends}
 Replaces: maven (<< 3.0.5-7)
-Breaks: maven (<< 3.0.5-7), gradle (<< 3.2.1-2~)
+Breaks: maven (<< 3.0.5-7), gradle (<< 2.7-4)
 Description: Core libraries for Maven 3
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,
diff --git a/debian/libmaven3-core-java.links b/debian/libmaven3-core-java.links
index 060fa74..398717c 100644
--- a/debian/libmaven3-core-java.links
+++ b/debian/libmaven3-core-java.links
@@ -8,5 +8,6 @@
 /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-resolver-provider.jar   /usr/share/java/maven-aether-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 64c3f2a..ed37aa5 100644
--- a/debian/libmaven3-core-java.poms
+++ b/debian/libmaven3-core-java.poms
@@ -37,7 +37,7 @@ 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-resolver-provider/pom.xml   --has-package-version --java-lib --usj-name=maven3-resolver-provider --relocate=org.apache.maven:maven-aether-provider:3.x
 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
 maven-slf4j-provider/pom.xml      --has-package-version --java-lib --usj-name=maven3-slf4j-provider

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git