[SCM] maven-hpi-plugin packaging branch, master, updated. upstream/1.71-16-gdeac76d

James Page james.page at canonical.com
Wed Jan 25 10:47:09 UTC 2012


The following commit has been merged in the master branch:
commit 13f1618ea3dbcef6732f9c007a4b663866e30d6c
Author: James Page <james.page at canonical.com>
Date:   Mon Nov 28 08:33:57 2011 +0000

    Reverted part of patch for apt processing

diff --git a/debian/patches/apt-to-jsr-269.patch b/debian/patches/apt-to-jsr-269.patch
index e8f4195..56b93be 100644
--- a/debian/patches/apt-to-jsr-269.patch
+++ b/debian/patches/apt-to-jsr-269.patch
@@ -87,12 +87,3 @@ Index: maven-hpi-plugin-debian/src/main/resources/META-INF/plexus/components.xml
                <process-classes>org.kohsuke:access-modifier-checker:enforce</process-classes>
                <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
                <generate-test-sources>org.jenkins-ci.tools:maven-hpi-plugin:insert-test</generate-test-sources>
-@@ -53,7 +53,7 @@
-             <id>default</id>
-             <phases>
-               <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
--              <compile>org.jenkins-ci.tools:maven-hpi-plugin:apt-compile</compile>
-+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-               <process-classes>org.kohsuke:access-modifier-checker:enforce</process-classes>
-               <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-               <generate-test-sources>org.jenkins-ci.tools:maven-hpi-plugin:insert-test</generate-test-sources>

-- 
maven-hpi-plugin packaging



More information about the pkg-java-commits mailing list