[jetty9] 02/05: Depend on taglibs-standard instead of jakarta-taglibs-standard

[Emmanuel Bourg]

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

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

commit 8ac32d361ee975da1dfe4091ef2f149c02132b85
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 13:20:50 2016 +0200

    Depend on taglibs-standard instead of jakarta-taglibs-standard
---
 debian/changelog    | 1 +
 debian/control      | 8 ++++----
 debian/jetty9.links | 4 ++--
 debian/maven.rules  | 3 ---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 350a43a..a6baaa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 jetty9 (9.2.16-2) UNRELEASED; urgency=medium
 
+  * Depend on taglibs-standard instead of jakarta-taglibs-standard
   * Track the release tags on GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 28 Jul 2016 13:00:57 +0200
diff --git a/debian/control b/debian/control
index f1b6ccc..27fdf12 100644
--- a/debian/control
+++ b/debian/control
@@ -14,14 +14,14 @@ Build-Depends: ant-optional,
                libasm-java (>= 5.0),
                libbuild-helper-maven-plugin-java,
                libmail-java,
-               libjakarta-taglibs-standard-java (>= 1.1.2-4~),
                libjcip-annotations-java,
-               libjstl1.1-java (>= 1.1.2-4~),
                libmaven-bundle-plugin-java,
                libmaven-shade-plugin-java,
                libmockito-java,
                libservlet3.1-java,
                libspring-beans-java,
+               libtaglibs-standard-spec-java,
+               libtaglibs-standard-impl-java,
                libtomcat8-java,
                maven-debian-helper,
                maven-repo-helper
@@ -47,10 +47,10 @@ Architecture: all
 Depends: glassfish-jmac-api,
          libasm-java (>= 5.0),
          libmail-java,
-         libjakarta-taglibs-standard-java (>= 1.1.2-4~),
          libjetty9-java (>= ${source:Version}),
-         libjstl1.1-java (>= 1.1.2-4~),
          libspring-beans-java,
+         libtaglibs-standard-spec-java,
+         libtaglibs-standard-impl-java,
          libtomcat8-java,
          ${misc:Depends}
 Suggests: jetty9
diff --git a/debian/jetty9.links b/debian/jetty9.links
index c9592db..0608047 100755
--- a/debian/jetty9.links
+++ b/debian/jetty9.links
@@ -59,8 +59,8 @@ usr/share/java/tomcat8-jsp-api.jar              usr/share/jetty9/lib/apache-jsp/
 usr/share/java/tomcat8-juli.jar                 usr/share/jetty9/lib/apache-jsp/tomcat-juli.jar
 usr/share/java/tomcat8-util.jar                 usr/share/jetty9/lib/apache-jsp/tomcat-util.jar
 usr/share/java/tomcat8-util-scan.jar            usr/share/jetty9/lib/apache-jsp/tomcat-util-scan.jar
-usr/share/java/jstl1.1.jar                      usr/share/jetty9/lib/apache-jsp/javax.servlet.jsp.jstl.jar
-usr/share/java/standard.jar                     usr/share/jetty9/lib/apache-jsp/org.apache.taglibs.standard.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/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 e6710eb..6f53f20 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,3 @@
-javax.servlet jstl jar s/.*/1.1/ * *
 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/ * *
@@ -10,8 +9,6 @@ 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/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * *
-s/org.apache.taglibs/javax.servlet/ s/taglibs-standard-spec/jstl/ * s/.*/1.1/ * *
-s/org.apache.taglibs/taglibs/ s/taglibs-standard-impl/standard/ * 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