[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:08 UTC 2012
The following commit has been merged in the master branch:
commit 4f5204350ebf389aac46137a700cd34f0a80f5a8
Author: James Page <james.page at canonical.com>
Date: Mon Nov 28 08:23:28 2011 +0000
Further fix to annotation processing
diff --git a/debian/patches/apt-to-jsr-269.patch b/debian/patches/apt-to-jsr-269.patch
index f862104..e8f4195 100644
--- a/debian/patches/apt-to-jsr-269.patch
+++ b/debian/patches/apt-to-jsr-269.patch
@@ -1,22 +1,15 @@
-From d00bd98cfd315dc4fc12da0ee7ea76f12529d30a Mon Sep 17 00:00:00 2001
-From: Kohsuke Kawaguchi <kk at kohsuke.org>
-Date: Fri, 1 Jul 2011 17:34:47 -0700
-Subject: [PATCH] Deprecating Sun APT API and switching over to JSR-269
+Desription: cPATCH] Deprecating Sun APT API and switching over to JSR-269.
+ Required in Debian/Ubuntu as we support the LTS release of Jenkins so we
+ can't use the most recent version of maven-hpi-plugin which requires a
+ much later version of jenkins-core.
+Author: Kohsuke Kawaguchi <kk at kohsuke.org>
+Origin: https://github.com/jenkinsci/maven-hpi-plugin/commit/d00bd98cfd315dc4fc12da0ee7ea76f12529d30a
----
- pom.xml | 2 +-
- .../hpi/AnnotationProcessorFactoryImpl.java | 3 +++
- .../jenkinsci/maven/plugins/hpi/AptCompiler.java | 3 +++
- .../org/jenkinsci/maven/plugins/hpi/AptMojo.java | 3 +++
- .../jenkinsci/maven/plugins/hpi/CompilerMojo.java | 3 +++
- src/main/resources/META-INF/plexus/components.xml | 2 +-
- 6 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index d224b64..98c1353 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -137,7 +137,7 @@
+Index: maven-hpi-plugin-debian/pom.xml
+===================================================================
+--- maven-hpi-plugin-debian.orig/pom.xml 2011-11-28 08:19:51.388069761 +0000
++++ maven-hpi-plugin-debian/pom.xml 2011-11-28 08:19:51.432069799 +0000
+@@ -150,7 +150,7 @@
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
@@ -25,11 +18,11 @@ index d224b64..98c1353 100644
<!-- make sure to exclude servlet so that the one in Jetty (which has different groupId) will win -->
<exclusions>
<exclusion>
-diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java
-index f9cb7f9..07d883d 100644
---- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java
-+++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java
-@@ -21,6 +21,9 @@ import java.util.Set;
+Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java
+===================================================================
+--- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java 2011-11-28 08:10:38.103639670 +0000
++++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java 2011-11-28 08:19:51.432069799 +0000
+@@ -21,6 +21,9 @@
/**
* @author Kohsuke Kawaguchi
@@ -39,11 +32,11 @@ index f9cb7f9..07d883d 100644
*/
public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactory {
-diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java
-index cfcb19b..65e7bd6 100644
---- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java
-+++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java
-@@ -16,6 +16,9 @@ import java.util.List;
+Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java
+===================================================================
+--- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java 2011-11-28 08:10:38.135639693 +0000
++++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java 2011-11-28 08:19:51.436069802 +0000
+@@ -16,6 +16,9 @@
* In Maven, {@link Compiler} handles the actual compiler invocation.
*
* @author Kohsuke Kawaguchi
@@ -53,11 +46,11 @@ index cfcb19b..65e7bd6 100644
*/
public class AptCompiler extends JavacCompiler {
-diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java
-index 5c25bfc..c3d9172 100644
---- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java
-+++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java
-@@ -11,6 +11,9 @@ import java.lang.reflect.Field;
+Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java
+===================================================================
+--- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java 2011-11-28 08:10:38.063639642 +0000
++++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java 2011-11-28 08:19:51.436069802 +0000
+@@ -11,6 +11,9 @@
* @phase compile
* @requiresDependencyResolution compile
* @author Kohsuke Kawaguchi
@@ -67,11 +60,11 @@ index 5c25bfc..c3d9172 100644
*/
public class AptMojo extends CompilerMojo {
public void execute() throws MojoExecutionException, CompilationFailureException {
-diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java
-index 54aed13..0cd7534 100644
---- a/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java
-+++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java
-@@ -37,6 +37,9 @@ import java.util.Set;
+Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java
+===================================================================
+--- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java 2011-11-28 08:10:38.083639656 +0000
++++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java 2011-11-28 08:19:51.436069802 +0000
+@@ -37,6 +37,9 @@
* @version $Id: CompilerMojo.java 10807 2008-07-14 18:56:05Z btosabre $
* @phase compile
* @requiresDependencyResolution compile
@@ -81,10 +74,10 @@ index 54aed13..0cd7534 100644
*/
public class CompilerMojo
extends AbstractCompilerMojo {
-diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
-index 05c2dc3..808b97b 100644
---- a/src/main/resources/META-INF/plexus/components.xml
-+++ b/src/main/resources/META-INF/plexus/components.xml
+Index: maven-hpi-plugin-debian/src/main/resources/META-INF/plexus/components.xml
+===================================================================
+--- maven-hpi-plugin-debian.orig/src/main/resources/META-INF/plexus/components.xml 2011-11-28 08:10:38.167639716 +0000
++++ maven-hpi-plugin-debian/src/main/resources/META-INF/plexus/components.xml 2011-11-28 08:21:17.628143305 +0000
@@ -12,7 +12,7 @@
<id>default</id>
<phases>
@@ -94,6 +87,12 @@ index 05c2dc3..808b97b 100644
<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>
---
-1.7.5.4
-
+@@ -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