The following commit has been merged in the master branch:
commit 594950c7bf52601755a1298d48e5e015333d76fe
Author: James Page james.p...@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.p...@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 000..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;
+ modelVersion4.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.
+ --
+ groupIdorg.jenkins-ci.plugins/groupId
+ artifactIdplugin/artifactId
+ nameJenkins plugin POM/name
+ versiondebian/version
+ packagingpom/packaging
+
+ dependencies
+dependency
+ groupIdorg.jenkins-ci.main/groupId
+ artifactIdjenkins-core/artifactId
+ version__VERSION__/version
+ scopeprovided/scope
+/dependency
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version4.x/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdjavax.servlet/groupId
+ artifactIdservlet-api/artifactId
+ version2.5/version
+ scopeprovided/scope
+/dependency
+ /dependencies
+
+ build
+finalName${project.artifactId}/finalName
+defaultGoalpackage/defaultGoal
+pluginManagement
+ plugins
+plugin
+ groupIdorg.kohsuke/groupId
+ artifactIdaccess-modifier-checker/artifactId
+ version1.0/version
+/plugin
+ /plugins
+/pluginManagement
+plugins
+ plugin
+groupIdorg.jenkins-ci.tools/groupId
+artifactIdmaven-hpi-plugin/artifactId
+version1.79/version
+extensionstrue/extensions
+configuration
+ showDeprecationtrue/showDeprecation
+/configuration
+ /plugin
+ plugin
+groupIdorg.kohsuke.stapler/groupId
+artifactIdmaven-stapler-plugin/artifactId
+version1.16/version
+extensionstrue/extensions
+ /plugin
+ plugin
+groupIdorg.jvnet.localizer/groupId
+artifactIdmaven-localizer-plugin/artifactId
+version1.13/version
+executions
+ execution
+goals
+ goalgenerate/goal
+/goals
+configuration
+ fileMaskMessages.properties/fileMask
+
outputDirectorytarget/generated-sources/localizer/outputDirectory
+/configuration
+ /execution
+/executions
+ /plugin
+ plugin
+artifactIdmaven-javadoc-plugin/artifactId
+ /plugin
+
