[dropwizard-metrics] 03/05: Minimal changes to get updated package building
Christopher Hoskin
christopher.hoskin at gmail.com
Sat Nov 26 13:24:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository dropwizard-metrics.
commit 53d7a8d3d25be58f18e64f3ff4003734ac027c5b
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date: Sat Nov 26 13:17:49 2016 +0000
Minimal changes to get updated package building
* Team upload
* Minimal changes to get updated package building
+ Remove old patches
+ Add new modules to libdropwizard-metrics-java.poms, ignore modules which
won't build.
+ Update maven.rules and maven.ignoreRules
+ Add new dependencies to debian/control
---
debian/changelog | 7 +++++
debian/control | 2 ++
debian/libdropwizard-metrics-java.poms | 12 +++++---
debian/maven.ignoreRules | 8 ++++++
debian/maven.rules | 10 ++++++-
debian/patches/dont-bundle-submodules.patch | 44 -----------------------------
debian/patches/dont-require-maven3.patch | 12 --------
debian/patches/series | 2 --
8 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8b6ee29..a95876b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
dropwizard-metrics (3.1.2-1) UNRELEASED; urgency=medium
+ * Team upload
* New upstream release (3.1.2)
+ * Minimal changes to get updated package building
+ + Remove old patches
+ + Add new modules to libdropwizard-metrics-java.poms, ignore modules which
+ won't build.
+ + Update maven.rules and maven.ignoreRules
+ + Add new dependencies to debian/control
-- Christopher Hoskin <christopher.hoskin at gmail.com> Sat, 26 Nov 2016 10:46:26 +0000
diff --git a/debian/control b/debian/control
index e5aee36..34806c1 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,8 @@ Build-Depends: debhelper (>= 9),
libmockito-java,
libservlet3.1-java,
libslf4j-java,
+ libhttpasyncclient-java,
+ liblog4j2-java,
maven-debian-helper
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/dropwizard-metrics.git
diff --git a/debian/libdropwizard-metrics-java.poms b/debian/libdropwizard-metrics-java.poms
index 1f85d7c..955a91e 100644
--- a/debian/libdropwizard-metrics-java.poms
+++ b/debian/libdropwizard-metrics-java.poms
@@ -28,7 +28,7 @@
pom.xml --no-parent --has-package-version --java-lib
metrics-core/pom.xml --java-lib
metrics-benchmarks/pom.xml --ignore
-metrics-jetty8/pom.xml --java-lib
+metrics-jetty8/pom.xml --ignore
metrics-logback/pom.xml --java-lib
metrics-servlet/pom.xml --java-lib
metrics-ganglia/pom.xml --java-lib
@@ -36,11 +36,15 @@ metrics-log4j/pom.xml --java-lib
metrics-json/pom.xml --java-lib
metrics-jersey/pom.xml --ignore
metrics-jetty9/pom.xml --ignore
-metrics-graphite/pom.xml --java-lib
+metrics-jetty9-legacy/pom.xml --ignore
+metrics-graphite/pom.xml --ignore
metrics-annotation/pom.xml --java-lib
metrics-jvm/pom.xml --java-lib
-metrics-ehcache/pom.xml --java-lib
+metrics-ehcache/pom.xml --ignore
metrics-jdbi/pom.xml --ignore
metrics-healthchecks/pom.xml --java-lib
metrics-httpclient/pom.xml --java-lib
-metrics-servlets/pom.xml --java-lib
+metrics-servlets/pom.xml --ignore
+metrics-httpasyncclient/pom.xml --java-lib
+metrics-jersey2/pom.xml --ignore
+metrics-log4j2/pom.xml
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 3857e95..b9234de 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,5 +1,13 @@
io.dropwizard.metrics metrics-jetty9 * * * *
+junit junit * * * *
org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.assertj assertj-core * * * *
org.codehaus.mojo findbugs-maven-plugin * * * *
+org.mockito mockito-core * * * *
+org.slf4j slf4j-simple * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index be07224..2a02075 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,10 +1,18 @@
+com.fasterxml.jackson.core jackson-databind bundle s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-databind bundle s/2\..*/2.x/ * *
+io.dropwizard.metrics metrics-core jar * * *
+io.dropwizard.metrics metrics-healthchecks jar * * *
+io.dropwizard.metrics metrics-httpclient jar * * *
+io.dropwizard.metrics metrics-jvm jar * * *
+io.dropwizard.metrics metrics-parent pom s/.*/debian/ * *
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.apache.httpcomponents httpasyncclient jar s/.*/debian/ * *
org.easytesting fest-assert-core jar s/.*/2.0M10/ * *
+com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
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/ * *
-com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
diff --git a/debian/patches/dont-bundle-submodules.patch b/debian/patches/dont-bundle-submodules.patch
deleted file mode 100644
index e541e47..0000000
--- a/debian/patches/dont-bundle-submodules.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/metrics-core/pom.xml
-+++ b/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
---- a/metrics-healthchecks/pom.xml
-+++ b/metrics-healthchecks/pom.xml
-@@ -10,7 +10,7 @@
-
- <artifactId>metrics-healthchecks</artifactId>
- <name>Metrics Health Checks</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
- <description>
- An addition to Metrics which provides the ability to run application-specific health checks,
- allowing you to check your application's heath in production.
---- a/metrics-jvm/pom.xml
-+++ b/metrics-jvm/pom.xml
-@@ -10,7 +10,7 @@
-
- <artifactId>metrics-jvm</artifactId>
- <name>JVM Integration for Metrics</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
- <description>
- A set of classes which allow you to monitor critical aspects of your Java Virtual Machine
- using Metrics.
---- a/metrics-json/pom.xml
-+++ b/metrics-json/pom.xml
-@@ -10,7 +10,7 @@
-
- <artifactId>metrics-json</artifactId>
- <name>Jackson Integration for Metrics</name>
-- <packaging>bundle</packaging>
-+ <packaging>jar</packaging>
- <description>
- A set of Jackson modules which provide serializers for most Metrics classes.
- </description>
diff --git a/debian/patches/dont-require-maven3.patch b/debian/patches/dont-require-maven3.patch
deleted file mode 100644
index b080917..0000000
--- a/debian/patches/dont-require-maven3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: dropwizard-metrics/pom.xml
-===================================================================
---- dropwizard-metrics.orig/pom.xml
-+++ dropwizard-metrics/pom.xml
-@@ -2,7 +2,6 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
-- <maven>3.0.0</maven>
- </prerequisites>
-
- <groupId>io.dropwizard.metrics</groupId>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8668aa8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dont-require-maven3.patch
-dont-bundle-submodules.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dropwizard-metrics.git
More information about the pkg-java-commits
mailing list