[metrics] 01/01: Build metrics-core module

Tim Potter tpot-guest at moszumanska.debian.org
Thu Nov 13 04:57:26 UTC 2014


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

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

commit b883f221f21e8450ecaac83eaf4e23567e97376d
Author: Tim Potter <tpot at hp.com>
Date:   Thu Nov 13 15:55:09 2014 +1100

    Build metrics-core module
---
 debian/control                              |  2 +-
 debian/libmetrics-java.poms                 | 18 ++++++++++++++++++
 debian/maven.ignoreRules                    |  2 ++
 debian/maven.properties                     |  7 +++++++
 debian/maven.rules                          |  6 ++++++
 debian/patches/dont-bundle-submodules.patch | 13 +++++++++++++
 debian/patches/series                       |  1 +
 7 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index edb4421..0ce887a 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
+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
 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 64b1188..783683d 100644
--- a/debian/libmetrics-java.poms
+++ b/debian/libmetrics-java.poms
@@ -26,3 +26,21 @@
 #     Empty by default. [mh_install]
 #
 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-ganglia/pom.xml --ignore
+metrics-log4j/pom.xml --ignore
+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-jdbi/pom.xml --ignore
+metrics-healthchecks/pom.xml --ignore
+metrics-httpclient/pom.xml --ignore
+metrics-servlets/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 4a583d1..af10032 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,2 +1,4 @@
+
+org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e088603
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,7 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+# Tests disabled due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707298
+# which causes a bunch of bogus test failures.
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..4ba4867
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,6 @@
+
+junit junit jar s/.*/4.x/ * *
+junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.easytesting fest-assert-core jar s/.*/2.0M10/ * *
+org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
diff --git a/debian/patches/dont-bundle-submodules.patch b/debian/patches/dont-bundle-submodules.patch
new file mode 100644
index 0000000..84ca676
--- /dev/null
+++ b/debian/patches/dont-bundle-submodules.patch
@@ -0,0 +1,13 @@
+Index: metrics/metrics-core/pom.xml
+===================================================================
+--- metrics.orig/metrics-core/pom.xml
++++ metrics/metrics-core/pom.xml
+@@ -10,7 +10,7 @@
+ 
+     <artifactId>metrics-core</artifactId>
+     <name>Metrics Core</name>
+-    <packaging>bundle</packaging>
++    <packaging>jar</packaging>
+     <description>
+         Metrics is a Java library which gives you unparalleled insight into what your code does in
+         production. Metrics provides a powerful toolkit of ways to measure the behavior of critical
diff --git a/debian/patches/series b/debian/patches/series
index 027e26f..8668aa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dont-require-maven3.patch
+dont-bundle-submodules.patch

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



More information about the pkg-java-commits mailing list