[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-1-3-g3b0e30f
The following commit has been merged in the master branch:
commit 15024b8b3bb610bf25a96167517ff6742ead5bdf
Author: James Page
Date: Wed Feb 8 17:01:45 2012 +
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 Wed, 08 Feb 2012 17:00:57 +
+
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=: Optional, the classifier for the
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-1-3-g3b0e30f
The following commit has been merged in the master branch:
commit 3b0e30fbf91fff72507a970496c64153c4a42191
Author: James Page
Date: Fri Feb 10 11:28:28 2012 +
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 Wed, 08 Feb 2012 17:00:57 +
+ -- James Page Fri, 10 Feb 2012 11:26:17 +
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..000
--- 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:
-# [option]*
-# where option can be:
-# --ignore: ignore this POM or
-# --no-parent: remove the tag from the POM
-# --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=: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=: 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 to use when installing the library in
/usr/share/java
-# --usj-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=: the destination for the real jar
-# it will be installed with mh_install.
-# --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/ * *
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-1-3-g3b0e30f
The following commit has been merged in the master branch: commit dff0ca654b18772ba24d86ebe5ca17c73ecdd68b Author: James Page Date: Wed Feb 8 17:10:39 2012 + Minor tweak to rules to deal with remoting diff --git a/debian/maven.rules b/debian/maven.rules index eb4d780..671cfbe 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -22,7 +22,7 @@ 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.424.2/ * * +org.jenkins-ci.main * * s/1\..*/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/ * * -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
