[jenkins-xstream] 12/13: Ensure dependency plugin is never called

James Downing Page jamespage at alioth.debian.org
Mon Aug 12 13:20:02 UTC 2013


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

jamespage pushed a commit to branch master
in repository jenkins-xstream.

commit dca3b107038a310d44f3de890de529cc98faa9cb
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 14:13:37 2013 +0100

    Ensure dependency plugin is never called
---
 ...-of-dependency-plugin-from-package-target.patch |   54 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 55 insertions(+)

diff --git a/debian/patches/0003-Drop-use-of-dependency-plugin-from-package-target.patch b/debian/patches/0003-Drop-use-of-dependency-plugin-from-package-target.patch
new file mode 100644
index 0000000..512dcea
--- /dev/null
+++ b/debian/patches/0003-Drop-use-of-dependency-plugin-from-package-target.patch
@@ -0,0 +1,54 @@
+From: James Page <james.page at ubuntu.com>
+Date: Mon, 12 Aug 2013 14:12:55 +0100
+Subject: Drop use of dependency plugin from package target
+
+Not required for Debian package build.
+---
+ xstream/pom.xml | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/xstream/pom.xml b/xstream/pom.xml
+index a9e62ac..3c751d9 100644
+--- a/xstream/pom.xml
++++ b/xstream/pom.xml
+@@ -161,40 +161,6 @@
+       </plugin>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>complete-test-classpath</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>copy</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>target/lib</outputDirectory>
+-              <artifactItems>
+-                <artifactItem>
+-                  <groupId>proxytoys</groupId>
+-                  <artifactId>proxytoys</artifactId>
+-                  <version>0.2.1</version>
+-                </artifactItem>
+-              </artifactItems>
+-            </configuration>
+-          </execution>
+-          <execution>
+-            <id>collect-dependencies</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>copy-dependencies</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>target/dependencies</outputDirectory>
+-              <includeScope>runtime</includeScope>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-jar-plugin</artifactId>
+         <executions>
+           <execution>
diff --git a/debian/patches/series b/debian/patches/series
index a68a4e2..f2f8dd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-build.patch
 0002-sax.patch
+0003-Drop-use-of-dependency-plugin-from-package-target.patch

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



More information about the pkg-java-commits mailing list