This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/9.2.23-1_bpo8+1 in repository jetty9.
commit cd4fa9a5f2e2a1045ba194a9e63b14cc04c02c03 Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 5 14:22:02 2018 +0100 Revert "No longer depend on glassfish-jmac-api and use the jaspic API from libtomcat8-java instead" This reverts commit 4d33662bdbf97cf4a802775e22926d6e806683a5. --- debian/changelog | 2 -- debian/control | 8 +++++--- debian/jetty9.links | 2 +- debian/maven.rules | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7506319..1496f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,6 @@ jetty9 (9.2.22-3) unstable; urgency=medium jetty9 (9.2.22-2) unstable; urgency=medium * Team upload. - * No longer depend on glassfish-jmac-api and use the jaspic API - from libtomcat8-java instead * Standards-Version updated to 4.0.0 -- Emmanuel Bourg <[email protected]> Tue, 04 Jul 2017 12:06:15 +0200 diff --git a/debian/control b/debian/control index f027a9b..95ed3cf 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: ant-optional, default-jdk, dh-exec, glassfish-javaee, + glassfish-jmac-api (>= 1:2.1.1-b31g-2), javahelper, junit, libasm-java (>= 5.0), @@ -21,7 +22,7 @@ Build-Depends: ant-optional, libspring-beans-java, libtaglibs-standard-spec-java, libtaglibs-standard-impl-java, - libtomcat8-java (>= 8.5), + libtomcat8-java, maven-debian-helper, maven-repo-helper Standards-Version: 4.1.3 @@ -43,13 +44,14 @@ Description: Java servlet engine and webserver -- core libraries Package: libjetty9-extra-java Architecture: all -Depends: libasm-java (>= 5.0), +Depends: glassfish-jmac-api, + libasm-java (>= 5.0), libmail-java, libjetty9-java (>= ${source:Version}), libspring-beans-java, libtaglibs-standard-spec-java, libtaglibs-standard-impl-java, - libtomcat8-java (>= 8.5), + libtomcat8-java, ${misc:Depends} Suggests: jetty9 Description: Java servlet engine and webserver -- extra libraries diff --git a/debian/jetty9.links b/debian/jetty9.links index 602fca7..95e9211 100755 --- a/debian/jetty9.links +++ b/debian/jetty9.links @@ -60,6 +60,6 @@ usr/share/java/tomcat8-util.jar usr/share/jetty9/lib/apache-jsp/ usr/share/java/tomcat8-util-scan.jar usr/share/jetty9/lib/apache-jsp/tomcat-util-scan.jar usr/share/java/taglibs-standard-spec.jar usr/share/jetty9/lib/apache-jsp/org.apache.taglibs.taglibs-standard-spec.jar usr/share/java/taglibs-standard-impl.jar usr/share/jetty9/lib/apache-jsp/org.apache.taglibs.taglibs-standard-impl.jar -usr/share/java/tomcat8-jaspic-api.jar usr/share/jetty9/lib/jaspi/javax.security.auth.message.jar +usr/share/java/glassfish-jmac-api.jar usr/share/jetty9/lib/jaspi/javax.security.auth.message.jar usr/share/java/javax.mail.jar usr/share/jetty9/lib/jndi/javax.mail.jar usr/share/java/tomcat8-websocket-api.jar usr/share/jetty9/lib/websocket/javax.websocket-api-1.0.jar diff --git a/debian/maven.rules b/debian/maven.rules index a557cbf..d77c5ea 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -8,7 +8,7 @@ s/javax\.annotation/org.apache.tomcat/ s/javax\.annotation-api/tomcat-annotation junit junit * s/4\..*/4.x/ * * org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * * s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * * -s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.security.auth.message/tomcat-jaspic-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * * s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * * s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/8.x/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
