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

Fri Feb 10 12:42:51 UTC 2012

The following commit has been merged in the master branch:
commit 3b0e30fbf91fff72507a970496c64153c4a42191
Author: James Page <james.page at ubuntu.com>
Date:   Fri Feb 10 11:28:28 2012 +0000

    Final updates to support plugin building

diff --git a/debian/changelog b/debian/changelog
index 8708bc7..395b4c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,13 @@ jenkins (1.424.2+dfsg-2) unstable; urgency=low
 
   * Enable Jenkins plugin components to support building plugins and modules:
     - d/control: Enabled libjenkins-plugin-parent-java, updated dependencies.
-    - d/plugin-pom.xml: New pom file to act as parent POM for plugins based
-      on upstream plugin pom file.
-    - d/libjenkins-plugin-parent-java: Refer to d/plugin-pom.xml.
+    - d/plugin-debian.pom.in,rules: Install pom file to act as parent POM for 
+      plugin development based on upstream plugin pom file.
+    - d/libjenkins-plugin-parent-java.poms: Dropped - no longer required.
     - d/patches/build/plugin.patch: Dropped - no longer required.
   * Switch to using libservlet2.5-java (Closes: #658805)
 
- -- James Page <james.page at ubuntu.com>  Wed, 08 Feb 2012 17:00:57 +0000
+ -- James Page <james.page at ubuntu.com>  Fri, 10 Feb 2012 11:26:17 +0000
 
 jenkins (1.424.2+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7ef63e0..7f60a34 100644
--- a/debian/control
+++ b/debian/control
@@ -123,8 +123,15 @@ Description: Jenkins CI core Java libraries
 
 Package: libjenkins-plugin-parent-java
 Architecture: all
-Depends: libmaven-hpi-plugin-java, libmaven-stapler-plugin-java,
- libjenkins-java, junit4, libservlet2.5-java, ${misc:Depends}
+Depends:
+ junit4,
+ libjenkins-java,
+ libmaven-hpi-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-stapler-plugin-java,
+ libservlet2.5-java,
+ libsurefire-java,
+ ${misc:Depends}
 Description: Jenkins Plugin Parent Maven POM
  Jenkins monitors executions of repeated jobs, such as building a software
  project or jobs run by cron. Among those things, current Jenkins focuses
@@ -148,7 +155,7 @@ Description: Jenkins Plugin Parent Maven POM
 
 Package: jenkins-common
 Architecture: all
-Depends: 
+Depends:
  libjenkins-remoting-java,
  libjffi-java,
  libjna-java,
@@ -180,9 +187,9 @@ Package: jenkins
 Architecture: all
 Depends:
  adduser,
- ${jenkins-daemon-deps},
  default-jre-headless | java6-runtime-headless,
  jenkins-common,
+ ${jenkins-daemon-deps},
  ${misc:Depends}
 Conflicts: jenkins-tomcat, tomcat6
 Description: Continuous Integration and Job Scheduling Server
@@ -210,8 +217,8 @@ Package: jenkins-slave
 Architecture: all
 Depends:
  adduser,
- ${jenkins-daemon-deps},
  default-jre-headless | java6-runtime-headless,
+ ${jenkins-daemon-deps},
  ${misc:Depends}
 Recommends: jenkins-cli, ssh-server | openssh-server
 Description: Jenkins slave node helper
diff --git a/debian/libjenkins-plugin-parent-java.poms b/debian/libjenkins-plugin-parent-java.poms
deleted file mode 100644
index 6afc3cd..0000000
--- a/debian/libjenkins-plugin-parent-java.poms
+++ /dev/null
@@ -1,26 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM or
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
-
-debian/plugin-pom.xml --has-package-version --keep-elements=build --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
index 671cfbe..f95c999 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,7 +23,7 @@ junit junit jar s/3\..*/3.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 # Map onto exact version during build process
 org.jenkins-ci.main * * s/1\..*/1.424.2/ * *
-org.jenkins-ci.plugins plugin * s/.*/1.424.2/ * *
+# Handle plugin package
 org.kohsuke access-modifier-annotation jar s/.*/1.0/ * *
 org.kohsuke access-modifier-checker *  s/.*/1.0/ * *
 # 3.x is needed due to later versions of some deps in Debian
diff --git a/debian/plugin-pom.xml b/debian/plugin-debian.pom.in
similarity index 94%
rename from debian/plugin-pom.xml
rename to debian/plugin-debian.pom.in
index 87ebcd8..283a79f 100644
--- a/debian/plugin-pom.xml
+++ b/debian/plugin-debian.pom.in
@@ -12,7 +12,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>__VERSION__</version>
+  <version>debian</version>
   <packaging>pom</packaging>
 
   <dependencies>
@@ -65,12 +65,6 @@
         <extensions>true</extensions>
       </plugin>
       <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <goals>deploy</goals>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.jvnet.localizer</groupId>
         <artifactId>maven-localizer-plugin</artifactId>
         <version>1.13</version>
diff --git a/debian/rules b/debian/rules
index 1bbe024..4f62bd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,16 @@ ifeq ($(shell dpkg-vendor --derives-from ubuntu || echo debian ),debian)
 DEB_DH_GENCONTROL_ARGS:= -- -Tdebian/debian_control_vars
 endif
 
+# Generate POM file for plugins
+debian/plugin-debian.pom: debian/plugin-debian.pom.in
+	sed -e "s|__VERSION__|$(DEB_UPSTREAM_VERSION)|g" $< > debian/plugin-debian.pom
+
 # Install the POM for plugin-parent manually as not part
-# of main build
-binary-post-install/libjenkins-plugin-parent-java::
-	mh_installpoms -plibjenkins-plugin-parent-java
+# of main build - manually installed as not managed by 
+# m-d-h as breaks build elements for re-use.
+binary-post-install/libjenkins-plugin-parent-java:: debian/plugin-debian.pom
+	dh_install -plibjenkins-plugin-parent-java debian/plugin-debian.pom \
+		usr/share/maven-repo/org/jenkins-ci/plugins/plugin/debian
 
 # Sort out MANIFEST.MF entries in jenkins cli .jar files
 # and create handy links for script wrapper
@@ -50,6 +56,7 @@ build/jenkins-slave::
 clean::
 	[ ! -f dummy.keystore ] || rm dummy.keystore
 	rm -rf debian/*.upstart
+	rm -rf debian/plugin-debian.pom
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
jenkins packaging

