[proguard] 06/08: Relocate the proguard-gradle jar to the all in one jar to avoid duplicating the files

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository proguard.

commit d8bd449addebcb0ebc5754a0f7766db194cd4f71
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 10:56:44 2016 +0200

    Relocate the proguard-gradle jar to the all in one jar to avoid duplicating the files
---
 debian/changelog     | 2 ++
 debian/proguard.poms | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a6b2fb..c198d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ proguard (5.3-1) UNRELEASED; urgency=medium
   * Build with Gradle instead of Ant
   * No longer use a patch to add the shell scripts
   * Install the /usr/share/java jars with maven-repo-helper
+  * Relocate the proguard-gradle jar to the all in one jar
+    to avoid duplicating the files
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Sep 2016 09:22:37 +0200
 
diff --git a/debian/proguard.poms b/debian/proguard.poms
index af392db..3e8952f 100644
--- a/debian/proguard.poms
+++ b/debian/proguard.poms
@@ -1,5 +1,4 @@
 buildscripts/maven/pom.xml
-buildscripts/maven/base/pom.xml    --has-package-version --java-lib --artifact=lib/proguard.jar --usj-name=proguard
-buildscripts/maven/gradle/pom.xml  --has-package-version --artifact=lib/proguard.jar
+buildscripts/maven/base/pom.xml    --has-package-version --java-lib --artifact=lib/proguard.jar --usj-name=proguard --relocate=net.sf.proguard:proguard-gradle
 buildscripts/maven/gui/pom.xml     --has-package-version --java-lib --artifact=lib/proguardgui.jar
 buildscripts/maven/retrace/pom.xml --has-package-version --java-lib --artifact=lib/retrace.jar

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