[metrics] 01/01: Replace jh_build with mh_build and reset built products

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository metrics.

commit 35a1c4909fb7e87312b4f0763c830b91e06b8342
Author: Tim Potter <tpot at hp.com>
Date:   Tue Nov 11 17:51:14 2014 +1100

    Replace jh_build with mh_build and reset built products
---
 debian/control |  2 +-
 debian/rules   | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index cd88b85..716ee90 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: metrics
 Section: java
 Priority: optional
 Maintainer: Tim Potter <tpot at hp.com>
-Build-Depends: debhelper (>= 9), default-jdk, javahelper, libslf4j-java, libjackson2-databind-java, liblog4j1.2-java, liblogback-java, libehcache-java, libgmetric4j-java, libservlet3.1-java
+Build-Depends: debhelper (>= 9), maven-debian-helper, default-jdk, javahelper, libslf4j-java, libjackson2-databind-java, liblog4j1.2-java, liblogback-java, libehcache-java, libgmetric4j-java, libservlet3.1-java
 Standards-Version: 3.9.6
 Homepage: https://dropwizard.github.io/metrics/3.1.0/
 Vcs-Git: git://anonscm.debian.org/collab-maint/metrics.git
diff --git a/debian/rules b/debian/rules
index 1c169d2..41fb9d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,7 @@
 #!/usr/bin/make -f
 
-JH_BUILD_OPTS=--javacopts="-source 1.7 -target 1.7" -N
 export JAVA_HOME=/usr/lib/jvm/default-java
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-export CLASSPATH=/usr/share/java/slf4j-api.jar:/usr/share/java/jackson-core.jar:/usr/share/java/jackson-databind.jar:metrics-core.jar:metrics-jvm.jar:metrics-healthchecks.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/logback-core.jar:/usr/share/java/logback-classic.jar:/usr/share/java/ehcache.jar:/usr/share/java/gmetric4j.jar:/usr/share/java/servlet-api-3.1.jar
-
-MODULES = core jvm annotation healthchecks json log4j logback ehcache ganglia graphite servlet
 
 %:
-	dh $@ --with javahelper
-
-override_jh_build:
-	for module in $(MODULES); do \
-	  jh_build $(JH_BUILD_OPTS) metrics-$$module.jar metrics-$$module/src/main; \
-        done
-
-override_jh_installlibs:
-	jh_installlibs metrics-*.jar
-
-override_jh_clean:
-	jh_clean
-	rm -f metrics-*.jar
+	dh $@ --buildsystem=maven --with javahelper

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