[jenkins] 01/04: Install core plugins: ant, matrix-auth, matrix-project, mailer and antisamy-markup-formatter
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Oct 18 22:07:16 BST 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins.
commit 2dbfcf4d047dd984d292ae4163ae33620cb29dbc
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 16 16:50:04 2014 +0200
Install core plugins: ant, matrix-auth, matrix-project, mailer and antisamy-markup-formatter
---
debian/changelog | 12 +++++
debian/control | 6 ++-
debian/jenkins.README.Debian | 11 +++--
debian/maven.rules | 2 -
debian/patches/build/0004-disable-plugins.patch | 64 ++++++++++++-------------
5 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 101d4b4..9a543c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+jenkins (1.565.3-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Install core plugins:
+ - matrix-auth 1.2 and matrix-project 1.3 (Closes: #764711)
+ - mailer 1.11 (Closes: #764960)
+ - ant 1.2
+ - antisamy-markup-formatter 1.2
+ * Removed the build dependency on libowasp-java-html-sanitizer-java
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 10 Oct 2014 18:06:20 +0200
+
jenkins (1.565.3-1) unstable; urgency=high
* Team upload.
diff --git a/debian/control b/debian/control
index f8b223f..21f0bec 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,14 @@ Build-Depends-Indep:
ant,
ant-optional,
groovy (>= 1.8.6-4~),
+ jenkins-ant-plugin,
+ jenkins-antisamy-markup-formatter-plugin,
jenkins-crypto-util,
jenkins-executable-war (>= 1.28),
jenkins-instance-identity (>= 1.3),
+ jenkins-mailer-plugin,
+ jenkins-matrix-auth-plugin,
+ jenkins-matrix-project-plugin,
jenkins-memory-monitor,
jenkins-ssh-cli-auth,
jenkins-task-reactor,
@@ -82,7 +87,6 @@ Build-Depends-Indep:
libmaven2-core-java,
libmetainf-services-java,
libmockito-java,
- libowasp-java-html-sanitizer-java,
libpam4j-java,
librobust-http-client-java,
libservlet3.1-java,
diff --git a/debian/jenkins.README.Debian b/debian/jenkins.README.Debian
index 11e814d..f14d271 100644
--- a/debian/jenkins.README.Debian
+++ b/debian/jenkins.README.Debian
@@ -2,9 +2,10 @@ Jenkins for Debian
------------------
This package differs in the following ways from the upstream distribution of
-jenkins:
+Jenkins:
- * Plugins are not bundled by default:
+ * A subset of the default plugins are bundled, most notably the following
+ plugins aren't installed by default:
- SSH Slaves Plugin
- Maven Integration Plugin
- Subversion Plugin
@@ -13,9 +14,9 @@ jenkins:
with Jenkins.
* Some plugins assume the default plugins are always installed and do not
- declare an explicit dependency. For example the Git plugin requires
- matrix-project-plugin to be installed manually.
- (see https://issues.jenkins-ci.org/browse/JENKINS-24864)
+ declare an explicit dependency. If you encounter a ClassNotFoundException
+ you may have to find the relevant dependencies in the plugins management
+ panel and install them.
* Native OS integration features that are disabled:
- Solaris: support for libzfs and libembeddedsu4j.
diff --git a/debian/maven.rules b/debian/maven.rules
index 6e9c209..f66a94d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -59,8 +59,6 @@ org.jruby.ext.posix s/jna-posix/jnr-posix/ * s/.*/debian/ * *
s/com.github.jnr/org.jruby.ext.posix/ jnr-posix * s/.*/debian/ * *
# Update to servlet3.1
javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
-# Updates for 1.424.6
-s/org.kohsuke/owasp-java-html-sanitizer/ s/owasp-html-sanitizer/owasp-java-html-sanitizer/ * s/.*/debian/ * *
# Updates for 1.447.1
s/org.jvnet.hudson/org.jenkins-ci/ commons-jexl * s/.*/debian/ * *
s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
diff --git a/debian/patches/build/0004-disable-plugins.patch b/debian/patches/build/0004-disable-plugins.patch
index 861a733..50efbde 100644
--- a/debian/patches/build/0004-disable-plugins.patch
+++ b/debian/patches/build/0004-disable-plugins.patch
@@ -20,12 +20,10 @@ Subject: disable-plugins
</dependencies>
<build>
-@@ -265,108 +270,6 @@
- <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
- <destFileName>winstone.jar</destFileName>
+@@ -267,41 +272,6 @@
</artifactItem>
-- <!-- bundled plugins -->
-- <artifactItem>
+ <!-- bundled plugins -->
+ <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>maven-plugin</artifactId>
- <type>hpi</type>
@@ -61,13 +59,13 @@ Subject: disable-plugins
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
-- <groupId>org.jenkins-ci.plugins</groupId>
-- <artifactId>ant</artifactId>
-- <version>1.2</version>
-- <type>hpi</type>
-- </artifactItem>
-- <artifactItem>
-- <groupId>org.jenkins-ci.plugins</groupId>
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.2</version>
+@@ -309,62 +279,26 @@
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>javadoc</artifactId>
- <version>1.1</version>
- <type>hpi</type>
@@ -98,13 +96,14 @@ Subject: disable-plugins
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
-- <artifactId>mailer</artifactId>
+ <artifactId>mailer</artifactId>
- <version>1.8</version>
-- <type>hpi</type>
-- </artifactItem>
-- <artifactItem>
-- <groupId>org.jenkins-ci.plugins</groupId>
-- <artifactId>matrix-auth</artifactId>
++ <version>1.11</version>
+ <type>hpi</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>matrix-auth</artifactId>
- <version>1.1</version>
- <type>hpi</type>
- </artifactItem>
@@ -112,20 +111,21 @@ Subject: disable-plugins
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>windows-slaves</artifactId>
- <version>1.0</version>
-- <type>hpi</type>
-- </artifactItem>
-- <artifactItem>
-- <groupId>org.jenkins-ci.plugins</groupId>
-- <artifactId>antisamy-markup-formatter</artifactId>
++ <version>1.2</version>
+ <type>hpi</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>antisamy-markup-formatter</artifactId>
- <version>1.1</version>
-- <type>hpi</type>
-- </artifactItem>
-- <artifactItem>
-- <groupId>org.jenkins-ci.plugins</groupId>
-- <artifactId>matrix-project</artifactId>
++ <version>1.2</version>
+ <type>hpi</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>matrix-project</artifactId>
- <version>1.2</version>
-- <type>hpi</type>
-- </artifactItem>
++ <version>1.3</version>
+ <type>hpi</type>
+ </artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
- <stripVersion>true</stripVersion>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git
More information about the pkg-java-commits
mailing list