[jenkins] 03/03: Depend on libmail-java instead of glassfish-mail

[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 b1333e0ae5532634f378281447f20012002e5bab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 23 16:04:21 2014 +0200

    Depend on libmail-java instead of glassfish-mail
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 490d51d..94d81ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jenkins (1.565.2-3) UNRELEASED; urgency=medium
 
   * Removed unused build dependencies: libjetty-java and glassfish-activation
+  * Depend on libmail-java instead of glassfish-mail
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 23 Sep 2014 13:42:42 +0200
 
diff --git a/debian/control b/debian/control
index 9fbde5c..7e4c62a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
 Build-Depends-Indep:
  ant,
  ant-optional,
- glassfish-mail,
  groovy (>= 1.8.6-4~),
  jenkins-crypto-util,
  jenkins-executable-war (>= 1.28),
@@ -68,6 +67,7 @@ Build-Depends-Indep:
  libjstl1.1-java,
  libjtidy-java,
  liblocalizer-java,
+ libmail-java,
  libmaven-antrun-extended-plugin-java,
  libmaven-assembly-plugin-java,
  libmaven-dependency-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index ea999f2..6e9c209 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -41,6 +41,7 @@ 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/javax.mail/com.sun.mail/ s/mail/javax.mail/ * 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