[metrics] 01/01: Build a bunch of leaf modules with dependencies already in Debian

[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 564776166182b6242d7fe0ef90d88972eaf52172
Author: Tim Potter <tpot at hp.com>
Date:   Fri Nov 14 09:47:34 2014 +1100

    Build a bunch of leaf modules with dependencies already in Debian
---
 debian/control              |  2 +-
 debian/libmetrics-java.poms | 16 ++++++++--------
 debian/maven.rules          |  3 +++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 0ce887a..9dae7bd 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), maven-debian-helper, default-jdk, javahelper, libslf4j-java, libjackson2-databind-java, liblog4j1.2-java, liblogback-java, libehcache-java, libgmetric4j-java, libservlet3.1-java, libmaven-bundle-plugin-java, libmaven-source-plugin-java, libmaven-enforcer-plugin-java, libmaven-javadoc-plugin-java, libfest-assert-java, libmockito-java, libslf4j-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, libmaven-bundle-plugin-java, libmaven-source-plugin-java, libmaven-enforcer-plugin-java, libmaven-javadoc-plugin-java, libfest-assert-java, libmockito-java, libslf4j-java, libservlet3.1-java, libhttpclient-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/libmetrics-java.poms b/debian/libmetrics-java.poms
index 783683d..9c1cf1b 100644
--- a/debian/libmetrics-java.poms
+++ b/debian/libmetrics-java.poms
@@ -28,19 +28,19 @@
 pom.xml --no-parent --has-package-version --java-lib
 metrics-core/pom.xml --java-lib
 metrics-benchmarks/pom.xml --ignore
-metrics-jetty8/pom.xml --ignore
-metrics-logback/pom.xml --ignore
-metrics-servlet/pom.xml --ignore
+metrics-jetty8/pom.xml --java-lib
+metrics-logback/pom.xml --java-lib
+metrics-servlet/pom.xml --java-lib
 metrics-ganglia/pom.xml --ignore
-metrics-log4j/pom.xml --ignore
+metrics-log4j/pom.xml --java-lib
 metrics-json/pom.xml --ignore
 metrics-jersey/pom.xml --ignore
 metrics-jetty9/pom.xml --ignore
 metrics-graphite/pom.xml --ignore
-metrics-annotation/pom.xml --ignore
-metrics-jvm/pom.xml --ignore
-metrics-ehcache/pom.xml --ignore
+metrics-annotation/pom.xml --java-lib
+metrics-jvm/pom.xml --java-lib
+metrics-ehcache/pom.xml --java-lib
 metrics-jdbi/pom.xml --ignore
 metrics-healthchecks/pom.xml --ignore
-metrics-httpclient/pom.xml --ignore
+metrics-httpclient/pom.xml --java-lib
 metrics-servlets/pom.xml --ignore
diff --git a/debian/maven.rules b/debian/maven.rules
index 4ba4867..24e7126 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,5 +2,8 @@
 junit junit jar s/.*/4.x/ * *
 junit junit jar s/3\..*/3.x/ * *
 junit junit jar s/4\..*/4.x/ * *
+log4j log4j jar s/1\.2\..*/1.2.x/ * *
 org.easytesting fest-assert-core jar s/.*/2.0M10/ * *
+javax.servlet javax.servlet-api * s/.*/3.1/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
 org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *

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