The following commit has been merged in the master branch: commit defb9e5bc74b8808b6146b64cadcf6494f8a93e9 Author: James Page <james.p...@canonical.com> Date: Mon Jan 9 22:51:21 2012 +0100
Updates for new upstream release diff --git a/debian/changelog b/debian/changelog index c21eeaa..22aa37a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -maven-hpi-plugin (1.71-1) unstable; urgency=low +maven-hpi-plugin (1.79-1) unstable; urgency=low * Initial Debian release (Closes: #634656) - -- James Page <james.p...@ubuntu.com> Wed, 26 Oct 2011 17:44:13 +0100 + -- James Page <james.p...@ubuntu.com> Mon, 09 Jan 2012 22:50:22 +0100 maven-hpi-plugin (1.71-0ubuntu1) oneiric; urgency=low diff --git a/debian/patches/apt-to-jsr-269.patch b/debian/patches/apt-to-jsr-269.patch deleted file mode 100644 index 5b706a1..0000000 --- a/debian/patches/apt-to-jsr-269.patch +++ /dev/null @@ -1,76 +0,0 @@ -Desription: 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 <k...@kohsuke.org> -Origin: https://github.com/jenkinsci/maven-hpi-plugin/commit/d00bd98cfd315dc4fc12da0ee7ea76f12529d30a - -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 10:16:58.892043420 +0000 -+++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AnnotationProcessorFactoryImpl.java 2011-11-28 10:17:34.640139886 +0000 -@@ -21,6 +21,9 @@ - - /** - * @author Kohsuke Kawaguchi -+ * @deprecated -+ * As the annotation processing has switched to JSR-269, -+ * we no longer need this code. - */ - public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactory { - -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 10:16:58.924043506 +0000 -+++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptCompiler.java 2011-11-28 10:17:34.640139886 +0000 -@@ -16,6 +16,9 @@ - * 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 { - -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 10:16:58.852043312 +0000 -+++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AptMojo.java 2011-11-28 10:17:34.640139886 +0000 -@@ -11,6 +11,9 @@ - * @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 { -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 10:16:58.872043366 +0000 -+++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/CompilerMojo.java 2011-11-28 10:17:34.644139897 +0000 -@@ -37,6 +37,9 @@ - * @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 { -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 10:16:58.956043593 +0000 -+++ maven-hpi-plugin-debian/src/main/resources/META-INF/plexus/components.xml 2011-11-28 10:17:34.644139897 +0000 -@@ -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> diff --git a/debian/patches/build-tools.patch b/debian/patches/build-tools.patch index 773f17e..96c2729 100644 --- a/debian/patches/build-tools.patch +++ b/debian/patches/build-tools.patch @@ -1,8 +1,8 @@ -Index: maven-hpi-plugin/pom.xml +Index: maven-hpi-plugin-debian/pom.xml =================================================================== ---- maven-hpi-plugin.orig/pom.xml 2011-07-01 12:04:47.000000000 +0100 -+++ maven-hpi-plugin/pom.xml 2011-07-01 12:28:44.564560856 +0100 -@@ -213,5 +213,23 @@ +--- maven-hpi-plugin-debian.orig/pom.xml 2012-01-09 22:49:16.277119338 +0100 ++++ maven-hpi-plugin-debian/pom.xml 2012-01-09 22:49:21.917134746 +0100 +@@ -223,5 +223,23 @@ </plugins> </build> </profile> diff --git a/debian/patches/disable-jetty-archetype.patch b/debian/patches/disable-jetty-archetype.patch index 01b3a49..acf4692 100644 --- a/debian/patches/disable-jetty-archetype.patch +++ b/debian/patches/disable-jetty-archetype.patch @@ -1,7 +1,7 @@ -Index: maven-hpi-plugin/pom.xml +Index: maven-hpi-plugin-debian/pom.xml =================================================================== ---- maven-hpi-plugin.orig/pom.xml 2011-07-01 12:37:42.174560522 +0100 -+++ maven-hpi-plugin/pom.xml 2011-07-01 12:37:53.104560517 +0100 +--- maven-hpi-plugin-debian.orig/pom.xml 2012-01-09 22:49:21.917134746 +0100 ++++ maven-hpi-plugin-debian/pom.xml 2012-01-09 22:49:22.981137653 +0100 @@ -31,6 +31,19 @@ <plugins> <plugin> diff --git a/debian/patches/openjdk6-fixup.patch b/debian/patches/openjdk6-fixup.patch index 183996c..9185912 100644 --- a/debian/patches/openjdk6-fixup.patch +++ b/debian/patches/openjdk6-fixup.patch @@ -1,8 +1,8 @@ -Index: maven-hpi-plugin/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java +Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java =================================================================== ---- maven-hpi-plugin.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java 2011-07-01 12:39:46.654560446 +0100 -+++ maven-hpi-plugin/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java 2011-07-01 12:40:01.454560437 +0100 -@@ -601,9 +601,6 @@ +--- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java 2012-01-09 22:49:16.189119097 +0100 ++++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java 2012-01-09 22:49:24.025140505 +0100 +@@ -618,9 +618,6 @@ unArchiver.setDestDirectory(location); unArchiver.extract(); } diff --git a/debian/patches/series b/debian/patches/series index 5c255a3..0c472bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ build-tools.patch disable-jetty-archetype.patch openjdk6-fixup.patch -apt-to-jsr-269.patch -- maven-hpi-plugin packaging _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits