[SCM] jenkins packaging branch, master, updated. debian/1.480.3+dfsg-1_exp1-2-gc7d7202
James Page
james.page at ubuntu.com
Sat Apr 6 20:50:04 UTC 2013
The following commit has been merged in the master branch:
commit 594950c7bf52601755a1298d48e5e015333d76fe
Author: James Page <james.page at ubuntu.com>
Date: Sat Apr 6 21:40:57 2013 +0100
Revert to using package specific plugin POM file over upstream provided version:
* Revert to using package specific plugin POM file over upstream
provided version:
- d/p/ignore-plugin-pom.patch: Exclude upstream provided plugin
POM file from build process, fixing FTBFS.
- d/rules,plugin-parent.pom.in: Use packaging specific plugin POM
file to ensure compatibility with Jenkins modules.
diff --git a/debian/changelog b/debian/changelog
index f33957a..9c85b16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jenkins (1.480.3+dfsg-1~exp2) UNRELEASED; urgency=low
+
+ * Revert to using package specific plugin POM file over upstream
+ provided version:
+ - d/p/ignore-plugin-pom.patch: Exclude upstream provided plugin
+ POM file from build process, fixing FTBFS.
+ - d/rules,plugin-parent.pom.in: Use packaging specific plugin POM
+ file to ensure compatibility with Jenkins modules.
+
+ -- James Page <james.page at ubuntu.com> Sat, 06 Apr 2013 21:37:29 +0100
+
jenkins (1.480.3+dfsg-1~exp1) experimental; urgency=low
* New upstream release (Closes: #700761, #679616):
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 45b4ce5..889880c 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -27,4 +27,3 @@ pom.xml --has-package-version --no-parent
core/pom.xml --has-package-version --ignore-pom
war/pom.xml --has-package-version --ignore-pom
cli/pom.xml --has-package-version --ignore-pom
-plugins/pom.xml --has-package-version --ignore-pom --no-parent --package=libjenkins-plugin-parent-java
diff --git a/debian/patches/series b/debian/patches/series
index f8979ad..331e847 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ build/use-stock-jmdns.patch
ubuntu/ubuntu-font.patch
build/use-stock-asm3.patch
build/use-debian-jbcrypt.patch
+build/ignore-plugin-pom.xml
diff --git a/debian/plugin-debian.pom.in b/debian/plugin-debian.pom.in
new file mode 100644
index 0000000..49f6c3c
--- /dev/null
+++ b/debian/plugin-debian.pom.in
@@ -0,0 +1,107 @@
+<?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>debian</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>
+ <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-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hudson.udp</name>
+ <value>33849</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/debian/rules b/debian/rules
index 6f97f63..7d5b6c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,17 @@ 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 - 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
binary-post-install/jenkins-cli::
--
jenkins packaging
More information about the pkg-java-commits
mailing list