[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-3-gcb7b7ac

[James Page]

The following commit has been merged in the master branch:
commit f31e1e77493f22daedecd85b7f2de12676957f91
Author: James Page <james.page at ubuntu.com>
Date:   Wed Feb 22 09:01:10 2012 +0000

    Dropped jcaptcha-slf4j.patch; no longer required as library not used.
    
    * Dropped jcaptcha-slf4j.patch; no longer required as library not used.
    * Updated plugin parent pom file to specifiy default source/target for
      maven-compiler-plugin as Java 1.5.

diff --git a/debian/changelog b/debian/changelog
index f259a5a..d2ea910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ jenkins (1.424.2+dfsg-3) unstable; urgency=low
   * Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to 
     support use of public/private keypairs when using the jenkins remote
     cli tool. 
+  * Dropped jcaptcha-slf4j.patch; no longer required as library not used.
+  * Updated plugin parent pom file to specifiy default source/target for
+    maven-compiler-plugin as Java 1.5.
 
- -- James Page <james.page at ubuntu.com>  Fri, 10 Feb 2012 15:32:33 +0000
+ -- James Page <james.page at ubuntu.com>  Mon, 13 Feb 2012 10:06:54 +0000
 
 jenkins (1.424.2+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8f7cb09..a78ece0 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,7 @@ Build-Depends-Indep:
  libcommons-logging-java,
  libjaxen-java,
  libjellydoc-java,
+ libjenkins-plugin-parent-java,
  libjenkins-commons-jelly-java,
  libjenkins-commons-jexl-java,
  libjenkins-htmlunit-java,
diff --git a/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch b/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch
deleted file mode 100644
index c224ead..0000000
--- a/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add dependency on slf4j as this is required to support
- use of JCaptcha 2.0 (upstream uses 1.x).
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml	2012-01-31 10:35:35.048316342 +0000
-+++ jenkins/core/pom.xml	2012-01-31 10:35:36.104316316 +0000
-@@ -435,6 +435,12 @@
-       <artifactId>memory-monitor</artifactId>
-       <version>1.5</version>
-     </dependency>
-+    <!-- JCaptcha 2.0 uses slf4j which needs an implementation class -->
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-jdk14</artifactId>
-+      <version>1.5.6</version>
-+    </dependency>
-     <dependency><!-- StAX implementation. See HUDSON-2547. -->
-       <groupId>org.codehaus.woodstox</groupId>
-       <artifactId>wstx-asl</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index be69c71..af02d0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,10 +9,8 @@ native-integration/filter-native-integrations.patch
 native-integration/purge-embedded-su4j.patch
 native-integration/purge-winp.patch
 native-integration/purge-windows-support.patch
-dependency-upgrades/jcaptcha-slf4j.patch
 dependency-upgrades/groovy-upgrade.patch
 dependency-upgrades/jnr-posix-upgrade.patch
 dependency-upgrades/asm3-upgrade.patch
 dependency-upgrades/animal-sniffer-upgrade.patch
 ubuntu/ubuntu-font.patch
-#groovy-2.0.0-compat.patch
diff --git a/debian/plugin-debian.pom.in b/debian/plugin-debian.pom.in
index 283a79f..49f6c3c 100644
--- a/debian/plugin-debian.pom.in
+++ b/debian/plugin-debian.pom.in
@@ -84,6 +84,13 @@
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <systemProperties>
diff --git a/debian/rules b/debian/rules
index 4f62bd3..a05436a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,12 @@ get-orig-source:
         ../jenkins_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz
 
 before-mvn-build:: dummy.keystore
+	# Purge out links relating to jenkins from the copy of the maven repo
+	# fixes issue with circular dependency and the need to use the install
+	# maven target
+	for module in jenkins-core cli pom jenkins-war; do \
+		find debian/maven-repo/org/jenkins-ci/main/$${module} -type l -delete || true ;\
+	done
 
 dummy.keystore:
 	keytool -genkeypair -dname "cn=Jenkins, ou=Jenkins Project, o=Debian, c=US" \

-- 
jenkins packaging