[jenkins-winstone] 10/14: Install the dependency reduced pom instead of marking Jetty as provided

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jenkins-winstone.

commit aa06a36d657191605fb2c3e05df8692fac7e91d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 5 16:53:10 2014 +0200

    Install the dependency reduced pom instead of marking Jetty as provided
---
 debian/patches/compile-time-dependencies.patch | 36 --------------------------
 debian/patches/series                          |  1 -
 debian/rules                                   |  4 +--
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/debian/patches/compile-time-dependencies.patch b/debian/patches/compile-time-dependencies.patch
deleted file mode 100644
index fa580ad..0000000
--- a/debian/patches/compile-time-dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Mark Jetty as a provided dependency to prevent maven-debian-helper
- from adding libjetty8-java in the package dependencies (Jetty is actually embedded
- in the Winstone jar)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -213,24 +213,28 @@
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-servlet</artifactId>
-       <version>8.1.13.v20130916</version>
-+      <scope>provided</scope>
-     </dependency>
- 
-     <dependency>
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-webapp</artifactId>
-       <version>8.1.13.v20130916</version>
-+      <scope>provided</scope>
-     </dependency>
- 
-     <dependency>
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-ajp</artifactId>
-       <version>8.1.13.v20130916</version>
-+      <scope>provided</scope>
-     </dependency>
- 
-     <dependency>
-       <groupId>org.eclipse.jetty.spdy</groupId>
-       <artifactId>spdy-jetty-http</artifactId>
-       <version>8.1.13.v20130916</version>
-+      <scope>provided</scope>
-     </dependency>
- 
-     <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index c5f84f9..04ddc90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-compile-time-dependencies.patch
 java8-compatibility.patch
diff --git a/debian/rules b/debian/rules
index 3b143c8..32ee7ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,8 @@ DEB_DH_GENCONTROL_ARGS_ALL := -- -Vlibjetty8-java:Version=${JETTY_VERSION}
 # and does not conflict with any pure winstone packaged
 # sometime in the future
 install/lib$(PACKAGE)-java::
-	mh_installjar -plib$(PACKAGE)-java --usj-name=$(PACKAGE) -l pom.xml \
-		target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar
+	mh_installpom -plib$(PACKAGE)-java dependency-reduced-pom.xml
+	mh_installjar -plib$(PACKAGE)-java --usj-name=$(PACKAGE) -l pom.xml target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar
 	jh_classpath -plib$(PACKAGE)-java
 
 get-orig-source:

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