[libspring-java] 01/02: No longer build spring-instrument-tomcat (obsolete) (Closes: #846683)

[Emmanuel Bourg]

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

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

commit adae00218715da9fd12381967929e55931606764
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Dec 3 22:59:49 2016 +0100

    No longer build spring-instrument-tomcat (obsolete) (Closes: #846683)
---
 debian/changelog | 1 +
 debian/rules     | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25abc0f..45a29fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libspring-java (4.3.4-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on libtaglibs-standard-jstlel-java instead of libjstl1.1-java
+  * No longer build spring-instrument-tomcat (obsolete) (Closes: #846683)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Nov 2016 15:45:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 93a4783..1b3b04e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ override_dh_auto_build:
 	dh_auto_build -- jar -x test -x check \
 	                 -x :spring-orm-hibernate4:compileJava \
 	                 -x :spring-orm-hibernate5:compileJava \
+	                 -x :spring-instrument-tomcat:compileJava \
 	                 -x :spring-webmvc-tiles2:compileJava \
 	                 -x :spring-websocket:compileJava
 
@@ -38,9 +39,5 @@ override_dh_auto_install:
 	mh_installpom -plibspring-aop-java --relocate=org.springframework:spring-aspects:3.x spring-aspects/build/debian/spring-aspects.pom
 	mh_installjar -plibspring-aop-java -nspring3-aspects --usj-version=3.x --java-lib spring-aspects/build/debian/spring-aspects.pom spring-aspects/build/libs/spring-aspects*.jar
 
-	# Install the spring-instrument-tomcat artifact in the instrument package
-	mh_installpom -plibspring-instrument-java --relocate=org.springframework:spring-instrument-tomcat:3.x spring-instrument-tomcat/build/debian/spring-instrument-tomcat.pom
-	mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat --usj-version=3.x --java-lib spring-instrument-tomcat/build/debian/spring-instrument-tomcat.pom spring-instrument-tomcat/build/libs/spring-instrument-tomcat*.jar
-
 get-orig-source:
 	uscan --download-current-version --rename --force-download

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