[jenkins] 02/03: Removed the unused build dependency on glassfish-activation

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit 46bab82ff0c64881932f2a79ec50e415ae383660
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 23 15:18:27 2014 +0200

    Removed the unused build dependency on glassfish-activation
---
 debian/changelog         | 2 +-
 debian/control           | 1 -
 debian/maven.ignoreRules | 2 ++
 debian/maven.rules       | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6462228..490d51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 jenkins (1.565.2-3) UNRELEASED; urgency=medium
 
-  * Removed the unused build dependency on libjetty-java
+  * Removed unused build dependencies: libjetty-java and glassfish-activation
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 23 Sep 2014 13:42:42 +0200
 
diff --git a/debian/control b/debian/control
index 2a26426..9fbde5c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
 Build-Depends-Indep:
  ant,
  ant-optional,
- glassfish-activation,
  glassfish-mail,
  groovy (>= 1.8.6-4~),
  jenkins-crypto-util,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index cffdc4b..5db47cd 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -28,6 +28,8 @@ org.codehaus.mojo apt-maven-plugin * * * *
 org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
 # OK: Bugs should be found upstream, not in Debian!
 org.codehaus.mojo findbugs-maven-plugin * * * *
+# OK: Provided by the JDK
+org.jvnet.hudson activation * * * *
 # FIXME: Used by test module - not currently enabled
 com.sun.maven maven-junit-plugin * * * *
 # OK: Only required for Java 1.5 which we don't support in Debia
diff --git a/debian/maven.rules b/debian/maven.rules
index c9bc6e8..ea999f2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -41,7 +41,6 @@ org.codehaus.groovy groovy* * s/.*/1.x/ * *
 org.springframework * * s/2\..*/3.x/ * *
 s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/2\..*/2.3/ * *
 # Remap hudson forks back to standard versions
-s/org.jvnet.hudson/javax.activation/ activation * s/.*/debian/ * *
 s/org.jenkins-ci/javax.jmdns/ jmdns * s/.*/debian/ * *
 s/org.jvnet.hudson/net.sf.jtidy/ jtidy * s/.*/debian/ * *
 s/org.jvnet.hudson/org.apache.maven/ maven-embedder * s/.*/debian/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git