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

[James Page]

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

    Added backported patch to fix annotation processing

diff --git a/debian/patches/apt-to-jsr-269.patch b/debian/patches/apt-to-jsr-269.patch
new file mode 100644
index 0000000..f862104
--- /dev/null
+++ b/debian/patches/apt-to-jsr-269.patch
@@ -0,0 +1,99 @@
+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
+
+---
+ 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 @@
+     <dependency>
+       <groupId>org.kohsuke.stapler</groupId>
+       <artifactId>maven-stapler-plugin</artifactId>
+-      <version>1.15</version>
++      <version>1.16</version>
+       <!-- 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;
+ 
+ /**
+  * @author Kohsuke Kawaguchi
++ * @deprecated
++ *      As the annotation processing has switched to JSR-269,
++ *      we no longer need this code.
+  */
+ 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;
+  * In Maven, {@link Compiler} handles the actual compiler invocation.
+  *
+  * @author Kohsuke Kawaguchi
++ * @deprecated
++ *      As the annotation processing has switched to JSR-269,
++ *      we no longer need this code.
+  */
+ 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;
+  * @phase compile
+  * @requiresDependencyResolution compile
+  * @author Kohsuke Kawaguchi
++ * @deprecated
++ *      As the annotation processing has switched to JSR-269,
++ *      we no longer use this mojo.
+  */
+ 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;
+  * @version $Id: CompilerMojo.java 10807 2008-07-14 18:56:05Z btosabre $
+  * @phase compile
+  * @requiresDependencyResolution compile
++ * @deprecated
++ *      As the annotation processing has switched to JSR-269,
++ *      we no longer need this code.
+  */
+ 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
+@@ -12,7 +12,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>
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 0c472bd..5c255a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 build-tools.patch
 disable-jetty-archetype.patch
 openjdk6-fixup.patch
+apt-to-jsr-269.patch

-- 
maven-hpi-plugin packaging