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

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

commit ea6981484852eacc5c2b4ca8ee095d44f393f8b1
Author: Emmanuel Bourg <ebo...@apache.org>
Date:   Thu Dec 14 16:52:57 2017 +0100

    Depend on libgeronimo-jta-1.2-spec-java instead of glassfish-javaee
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e1be03..09c7421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jetty9 (9.2.22-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libgeronimo-jta-1.2-spec-java instead of glassfish-javaee
   * Standards-Version updated to 4.1.2
 
  -- Emmanuel Bourg <ebo...@apache.org>  Thu, 14 Dec 2017 16:41:30 +0100
diff --git a/debian/control b/debian/control
index 7d55464..14831a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Build-Depends: ant-optional,
                debhelper (>= 10),
                default-jdk,
                dh-exec,
-               glassfish-javaee,
                javahelper,
                junit,
                libasm-java (>= 5.0),
                libbuild-helper-maven-plugin-java,
+               libgeronimo-jta-1.2-spec-java,
                libmail-java,
                libjcip-annotations-java,
                libmaven-bundle-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index a50a2e2..44eabc4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,8 +2,8 @@ javax.servlet.jsp javax.jsp-api jar s/.*/2.3/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.el javax.el-api jar s/.*/3.0/ * *
 javax.websocket javax.websocket-api jar s/.*/1.0/ * *
-javax.transaction s/javax.transaction-api/transaction-api/ jar s/.*/debian/ * *
 s/javax.annotation/org.apache.tomcat/ 
s/javax.annotation-api/tomcat-annotations-api/ * s/.*/8.x/ * *
+s/javax.transaction/org.apache.geronimo.specs/ 
s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
 
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to