The following commit has been merged in the master branch:
commit d183112f995950557348c7505ece510e72d49bad
Author: James Page <james.p...@canonical.com>
Date:   Fri Jan 6 16:46:28 2012 +0000

    Minor tweaks for build diagnosis

diff --git a/debian/maven.properties b/debian/maven.properties
index 564d75b..94145c2 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,6 +1,6 @@
 # Include here properties to pass to Maven during the build.
 # For example:
 # maven.test.skip=true
-maven.compiler.source=1.5
-maven.compiler.target=1.5
-maven.compller.excludes=**/AbstractJettyMojo.java,**/RunMojo.java,**/AbstractJetty6Mojo.java,**/ConsoleScanner.java,**/CreateMojo.java
+maven.compiler.source=1.6
+maven.compiler.target=1.6
+maven.compiler.verbose=true
diff --git a/debian/patches/apt-to-jsr-269.patch 
b/debian/patches/apt-to-jsr-269.patch
index 56b93be..5b706a1 100644
--- a/debian/patches/apt-to-jsr-269.patch
+++ b/debian/patches/apt-to-jsr-269.patch
@@ -1,27 +1,14 @@
-Desription: cPATCH] Deprecating Sun APT API and switching over to JSR-269.
+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/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>
--      <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>
 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
+--- 
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 @@
  
  /**
@@ -34,8 +21,8 @@ Index: 
maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/Ann
  
 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
+--- 
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.
   *
@@ -48,8 +35,8 @@ Index: 
maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/Apt
  
 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
+--- 
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
@@ -62,8 +49,8 @@ Index: 
maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/Apt
      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 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
+--- 
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
@@ -76,8 +63,8 @@ Index: 
maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/Com
      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 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
+--- 
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>
diff --git a/debian/rules b/debian/rules
index b76c54a..810c285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_ARGS :=  -e
 
 get-orig-source:
        uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename

-- 
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

Reply via email to