[antlr3] 09/17: Remove the antlr3 artifacts from debian/maven-repo before invoking Maven (Closes: #706172)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 22 16:58:51 UTC 2015


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

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

commit daf3901ea0daabe4b3d7271b63d84457c1181407
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 22 03:14:25 2015 +0200

    Remove the antlr3 artifacts from debian/maven-repo before invoking Maven (Closes: #706172)
---
 debian/changelog | 5 ++++-
 debian/rules     | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8486442..a4e7a75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ antlr3 (3.5.2-1) UNRELEASED; urgency=medium
     - Ignore the new modules: antlr-complete, antlr3-maven-archetype
     - Added a dependency on libstringtemplate4-java
     - Refreshed debian/generated-sources
-  * debian/rules: Changed the bnd command to work with any upstream version
+  * debian/rules:
+    - Changed the bnd command to work with any upstream version
+    - Remove the antlr3 artifacts from debian/maven-repo before invoking Maven
+      (Closes: #706172)
   * debian/watch: Watch the release tags on Github
   * Use XZ compression for the upstream tarball
 
diff --git a/debian/rules b/debian/rules
index 04703cd..12b3d7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,10 @@ DEB_MAVEN_ARGS := -DbuildNumber="debian-$(shell echo $(DEB_NOEPOCH_VERSION) | se
 before-mvn-build:: PLUGIN_ARGS += -Dmaven.test.skip=true -Duse.maven.repo.local=true
 before-mvn-build:: unpatch-poms
 	cp -r debian/generated-sources/antlr3/* tool/src/main/java
+	rm -Rf debian/maven-repo/org/antlr/antlr
+	rm -Rf debian/maven-repo/org/antlr/antlr-master
+	rm -Rf debian/maven-repo/org/antlr/antlr-runtime
+	rm -Rf debian/maven-repo/org/antlr/antlr3-maven-plugin
 	mh_patchpoms -pantlr3 --debian-build --keep-pom-version -idebian/maven.bootstrap.ignoreRules --maven-repo=$(DEB_MAVEN_REPO)
 	$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) -N $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET)
 	cd runtime/Java        && $(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET)

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



More information about the pkg-java-commits mailing list