[jetty] Symlink to glassfish-servlet-api instead of tomcat

[Michael Šimáček]

commit 6d52d6aa1e13848f524dbdf0723cb909b856508f
Author: Michael Simacek <msimacek at redhat.com>
Date:   Wed Dec 18 16:06:04 2013 +0100

    Symlink to glassfish-servlet-api instead of tomcat

 jetty.spec |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index f36ec33..11463b3 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
 
 Name:           jetty
 Version:        9.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -150,8 +150,10 @@ Requires:       jetty-websocket-common     = %{version}-%{release}
 Requires:       jetty-websocket-server     = %{version}-%{release}
 Requires:       jetty-websocket-servlet    = %{version}-%{release}
 
-# Jetty needs newer version of servlet-api than the default provider
-# and requires generator omits version so it needs to be added explicitly
+# javax.servlet-api is provided by both glassfish-servlet-api and
+# tomcat-servlet-3.0-api, but we need version 3.1
+# this is a temporary solution, that should be removed when the duplicate
+# provides problem is solved
 Requires:       glassfish-servlet-api
 
 Requires(pre):    shadow-utils
@@ -551,12 +553,6 @@ find . -name "*.class" -exec rm {} \;
 # enforcer plugin constantly complains
 %pom_remove_plugin :maven-enforcer-plugin
 
-# Change servelt groupId to javax.servlet
-%pom_xpath_inject "pom:project/pom:properties" "
-    <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
-    <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
-    <servlet.spec.version>3.0.20100224</servlet.spec.version>"
-
 # Prevents problem with "Reporting mojo's can only be called from
 # ReportDocumentRender". Investigate proper fix some other time?
 %pom_remove_plugin :maven-pmd-plugin
@@ -670,8 +666,8 @@ rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,websocket}/*
 rm %{buildroot}%{homedir}/lib/*.jar
 
 # recreat tarball structure in lib
-ln -sf $(build-classpath tomcat-servlet-3.0-api) \
-       %{buildroot}%{homedir}/lib/servlet-api-3.0.jar
+ln -sf $(build-classpath glassfish-servlet-api) \
+       %{buildroot}%{homedir}/lib/servlet-api-3.1.jar
 
 build-jar-repository %{buildroot}%{homedir}/lib/annotations \
                      objectweb-asm/asm-all geronimo-annotation
@@ -844,6 +840,9 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Wed Dec 18 2013 Michael Simacek <msimacek at redhat.com> - 9.1.0-2
+- Symlink to glassfish-servlet-api instead of tomcat
+
 * Wed Nov 27 2013 Michael Simacek <msimacek at redhat.com> - 9.1.0-1
 - Update to upstream version 9.1.0