[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-1-3-g3b0e30f
James Page
james.page at ubuntu.com
Fri Feb 10 12:42:50 UTC 2012
The following commit has been merged in the master branch:
commit 15024b8b3bb610bf25a96167517ff6742ead5bdf
Author: James Page <james.page at ubuntu.com>
Date: Wed Feb 8 17:01:45 2012 +0000
Enable Jenkins plugin components to support building plugins and modules:
* 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/patches/build/plugin.patch: Dropped - no longer required.
* Switch to using libservlet2.5-java (Closes: #658805)
diff --git a/debian/changelog b/debian/changelog
index 1e8df39..8708bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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/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
+
jenkins (1.424.2+dfsg-1) unstable; urgency=low
[ Miguel Landaeta ]
diff --git a/debian/control b/debian/control
index cc4aadb..7ef63e0 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,7 @@ Build-Depends-Indep:
libmetainf-services-java,
libpam4j-java,
librobust-http-client-java,
- libservlet2.4-java,
+ libservlet2.5-java,
libsezpoz-java,
libspring-aop-java,
libspring-core-java,
@@ -121,29 +121,30 @@ Description: Jenkins CI core Java libraries
This package contains the core libraries that are used by Jenkins.
These are useful when building other components such as plugins.
-#Package: libjenkins-plugin-parent-java
-#Architecture: all
-#Depends: libmaven-hpi-plugin-java, libmaven-stapler-plugin-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
-# on the following two jobs:
-# .
-# * Building/testing software projects continuously, just like CruiseControl
-# or DamageControl. In a nutshell, Jenkins provides an easy-to-use
-# so-called continuous integration system, making it easier for developers
-# to integrate changes to the project, and making it easier for users to
-# obtain a fresh build. The automated, continuous build increases
-# productivity.
-# * Monitoring executions of externally-run jobs, such as cron jobs and
-# procmail jobs, even those that are run on a remote machine. For example,
-# with cron, all you receive is regular e-mails that capture the output,
-# and it is up to you to look at them diligently and notice when it broke.
-# Jenkins keeps those outputs and makes it easy for you to notice when
-# something is wrong.
-# .
-# This package contains the parent POM file that all Jenkins plugins should be
-# built against.
+Package: libjenkins-plugin-parent-java
+Architecture: all
+Depends: libmaven-hpi-plugin-java, libmaven-stapler-plugin-java,
+ libjenkins-java, junit4, libservlet2.5-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
+ on the following two jobs:
+ .
+ * Building/testing software projects continuously, just like CruiseControl
+ or DamageControl. In a nutshell, Jenkins provides an easy-to-use
+ so-called continuous integration system, making it easier for developers
+ to integrate changes to the project, and making it easier for users to
+ obtain a fresh build. The automated, continuous build increases
+ productivity.
+ * Monitoring executions of externally-run jobs, such as cron jobs and
+ procmail jobs, even those that are run on a remote machine. For example,
+ with cron, all you receive is regular e-mails that capture the output,
+ and it is up to you to look at them diligently and notice when it broke.
+ Jenkins keeps those outputs and makes it easy for you to notice when
+ something is wrong.
+ .
+ This package contains the parent POM file that all Jenkins plugins and modules
+ should be built against.
Package: jenkins-common
Architecture: all
diff --git a/debian/libjenkins-plugin-parent-java.poms b/debian/libjenkins-plugin-parent-java.poms
index d3380f9..6afc3cd 100644
--- a/debian/libjenkins-plugin-parent-java.poms
+++ b/debian/libjenkins-plugin-parent-java.poms
@@ -22,5 +22,5 @@
# --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.
-#
-plugins/pom.xml --has-package-version --keep-elements=build --no-parent
+
+debian/plugin-pom.xml --has-package-version --keep-elements=build --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
index ec75f6d..eb4d780 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +22,8 @@ commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
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.main * * s/.*/1.424.2/ * *
+org.jenkins-ci.plugins plugin * s/.*/1.424.2/ * *
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
@@ -33,7 +34,7 @@ commons-collections commons-collections * s/3\..*/3.x/ * *
commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
s/groovy/org.codehaus.groovy/ groovy * s/.*/debian/ * *
-org.kohsuke.stapler maven-stapler-plugin * s/.*/1.15/ * *
+org.kohsuke.stapler maven-stapler-plugin * s/.*/1.16/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
s/groovy/org.codehaus.groovy/ groovy* * s/.*/debian/ * *
org.mortbay.jetty * * s/6\..*/6.x/ * *
@@ -46,8 +47,6 @@ s/org.jvnet.hudson/net.sf.jtidy/ jtidy * s/.*/debian/ * *
s/org.jvnet.hudson/org.apache.maven/ maven-embedder * s/.*/debian/ * *
org.springframework.security * * s/2\..*/2.x/ * *
org.jenkins-ci.tools maven-hpi-plugin * s/.*/1.79/ * *
-org.jenkins-ci jenkins pom s/.*/1.x/ * *
-org.jenkins-ci.plugins plugin * s/1\..*/1.x/ * *
# Remap of jellys to jenkins variant
s/commons-jelly/org.jenkins-ci/ * * s/.*/debian/ * *
s/org.jvnet.hudson/org.jenkins-ci/ commons-jelly-tags-define * s/.*/debian/ * *
@@ -59,4 +58,5 @@ javax.servlet jstl * s/1\.1\..*/1.1/ * *
org.jruby.ext.posix s/jna-posix/jnr-posix/ * s/.*/debian/ * *
# Remap for later version of animal sniffer
s/org.jvnet/org.codehaus.mojo/ s/animal-sniffer-annotation/animal-sniffer-annotations/ jar s/.*/debian/ * *
-
+# Update to servlet2.5
+javax.servlet servlet-api * s/.*/2.5/ * *
diff --git a/debian/patches/build/plugin.patch b/debian/patches/build/plugin.patch
deleted file mode 100644
index 3159e7a..0000000
--- a/debian/patches/build/plugin.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Fix up plugin parent POM to allow generation from this
- source package.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
-Index: jenkins/plugins/pom.xml
-===================================================================
---- jenkins.orig/plugins/pom.xml 2012-01-31 10:35:19.584316730 +0000
-+++ jenkins/plugins/pom.xml 2012-01-31 10:35:33.136316390 +0000
-@@ -10,7 +10,7 @@
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>plugin</artifactId>
- <name>Jenkins plugin POM</name>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- <packaging>pom</packaging>
-
- <!--
-@@ -33,7 +33,7 @@
- <dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>maven-plugin</artifactId>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-@@ -43,25 +43,25 @@
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>jenkins-war</artifactId>
- <type>war</type>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>jenkins-core</artifactId>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>jenkins-test-harness</artifactId>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>ui-samples-plugin</artifactId>
-- <version>1.424.2-SNAPSHOT</version>
-+ <version>1.424.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index ae3021d..be69c71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
build/build.patch
-build/plugin.patch
build/disable-avalon-frawework.patch
build/openjdk6.patch
build/remove-licensing-report.patch
diff --git a/debian/plugin-pom.xml b/debian/plugin-pom.xml
new file mode 100644
index 0000000..87ebcd8
--- /dev/null
+++ b/debian/plugin-pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <!--
+ This POM file is based on the Plugin POM file provided by
+ jenkins core; however to make it work in any maintainable
+ fashion in debian where we don't have a full maven repo
+ with version metadata versions of plugins used in the build
+ must be specified otherwise maven will not be able to resolve
+ them.
+ -->
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>plugin</artifactId>
+ <name>Jenkins plugin POM</name>
+ <version>__VERSION__</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jenkins-ci.main</groupId>
+ <artifactId>jenkins-core</artifactId>
+ <version>__VERSION__</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.x</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <defaultGoal>package</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.kohsuke</groupId>
+ <artifactId>access-modifier-checker</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jenkins-ci.tools</groupId>
+ <artifactId>maven-hpi-plugin</artifactId>
+ <version>1.79</version>
+ <extensions>true</extensions>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.kohsuke.stapler</groupId>
+ <artifactId>maven-stapler-plugin</artifactId>
+ <version>1.16</version>
+ <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>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <fileMask>Messages.properties</fileMask>
+ <outputDirectory>target/generated-sources/localizer</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hudson.udp</name>
+ <value>33849</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
--
jenkins packaging
More information about the pkg-java-commits
mailing list