[jetty] Update to upstream version 9.1.0

Wed Dec 4 09:11:27 UTC 2013

commit 4c447fff7f529bf1f7ead1770b8d847f8945ddcd
Author: Michael Simacek <msimacek at redhat.com>
Date:   Thu Nov 28 10:41:54 2013 +0100

    Update to upstream version 9.1.0

 .gitignore |    1 +
 jetty.spec |   95 ++++++++++++++++++++++++++++++++++++------------------------
 sources    |    2 +-
 3 files changed, 59 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a7de52f..efb9ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ jetty-6.1.26-src.zip
 /jetty-9.0.4.v20130625.tar.gz
 /jetty-9.0.5.v20130815.tar.gz
 /jetty-9.0.6.v20130930.tar.gz
+/jetty-9.1.0.v20131115.tar.gz
diff --git a/jetty.spec b/jetty.spec
index fbe2718..f36ec33 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver v20130930
+%global addver v20131115
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -54,7 +54,7 @@
 %endif
 
 Name:           jetty
-Version:        9.0.6
+Version:        9.1.0
 Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -72,8 +72,11 @@ Patch4:         0004-Modify-dependencies.patch
 
 BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
-BuildRequires:  geronimo-jta
+BuildRequires:  jboss-transaction-1.2-api
+BuildRequires:  jboss-websocket-1.0-api
+BuildRequires:  glassfish-annotation-api
 BuildRequires:  geronimo-parent-poms
+BuildRequires:  glassfish-servlet-api
 BuildRequires:  glassfish-el
 BuildRequires:  glassfish-el-api
 BuildRequires:  glassfish-jsp
@@ -89,6 +92,7 @@ BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-shade-plugin
 BuildRequires:  maven-war-plugin
+BuildRequires:  exec-maven-plugin
 BuildRequires:  objectweb-asm
 BuildRequires:  slf4j
 BuildRequires:  systemd-units
@@ -116,6 +120,7 @@ BuildRequires:  jetty-toolchain
 BuildRequires:  jetty-assembly-descriptors
 BuildRequires:  jetty-test-policy
 BuildRequires:  jetty-artifact-remote-resources
+BuildRequires:  jetty-schemas
 
 BuildArch:      noarch
 
@@ -145,6 +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
+Requires:       glassfish-servlet-api
+
 Requires(pre):    shadow-utils
 Requires(post):   systemd-units, systemd-sysv
 Requires(preun):  systemd-units
@@ -330,12 +339,6 @@ Summary:        servlets module for Jetty
 %description    servlets
 %{extdesc} %{summary}.
 
-%package        overlay-deployer
-Summary:        overlay-deployer module for Jetty
-
-%description    overlay-deployer
-%{extdesc} %{summary}.
-
 %if %{with spring}
 %package        spring
 Summary:        spring module for Jetty
@@ -412,6 +415,24 @@ Summary:        websocket-servlet module for Jetty
 %description    websocket-servlet
 %{extdesc} %{summary}.
 
+%package        websocket-mux-extension
+Summary:        websocket-mux-extension module for Jetty
+
+%description    websocket-mux-extension
+%{extedesc} %{summary}.
+
+%package        javax-websocket-client-impl
+Summary:        javax-websocket-client-impl module for Jetty
+
+%description    javax-websocket-client-impl
+%{extedesc} %{summary}.
+
+%package        javax-websocket-server-impl
+Summary:        javax-websocket-server-impl module for Jetty
+
+%description    javax-websocket-server-impl
+%{extedesc} %{summary}.
+
 %if %{with nosql}
 %package        nosql
 Summary:        nosql module for Jetty
@@ -470,7 +491,7 @@ License:        (ASL 2.0 or EPL) and MIT
 
 %prep
 %setup -q -n %{jettyname}-%{version}.%{addver}
-for f in $(find . -name "*.?ar"); do rm $f; done
+find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
 
 %patch0 -p1 -b .sav
@@ -479,6 +500,23 @@ find . -name "*.class" -exec rm {} \;
 # Use proper groupId for apache ant
 %pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml
 
+%pom_remove_dep "javax.transaction:javax.transaction-api" jetty-plus
+%pom_remove_dep "javax.transaction:javax.transaction-api" jetty-maven-plugin
+%pom_remove_dep "javax.transaction:javax.transaction-api"
+%pom_remove_dep "javax.transaction:javax.transaction-api" jetty-distribution
+%pom_add_dep "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec" jetty-plus
+%pom_add_dep "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec" jetty-maven-plugin
+%pom_add_dep "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec"
+%pom_add_dep "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec" jetty-distribution
+%pom_remove_dep "org.glassfish:javax.el" jetty-jsp
+%pom_remove_dep "org.glassfish:javax.el" jetty-distribution
+%pom_add_dep "org.glassfish.web:javax.el" jetty-jsp
+%pom_add_dep "org.glassfish.web:javax.el" jetty-distribution
+%pom_remove_dep "org.eclipse.jetty.toolchain:jetty-jsp-jdt" jetty-distribution
+
+%pom_remove_plugin ":clirr-maven-plugin" jetty-websocket
+%pom_remove_plugin ":maven-eclipse-plugin" jetty-osgi
+
 # Disable test and example artifacts
 # they need more dependencies then we have time for right now :-)
 # and also xmvn currently doesn't support .war
@@ -615,7 +653,6 @@ rm -f %{buildroot}%{homedir}/bin/*cygwin*
 # copy previously extracted configuration
 cp jetty-distribution/target/distribution/etc/* %{buildroot}%{homedir}/etc/
 
-chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
 chmod +x djetty
 mv djetty %{buildroot}%{_bindir}/djetty
 ln -s %{homedir}/bin/jetty.sh %{buildroot}%{_bindir}/%{name}
@@ -645,7 +682,7 @@ build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
            glassfish-el taglibs-core taglibs-standard glassfish-jsp \
            glassfish-jsp-api ecj
 
-ln -sf $(build-classpath geronimo-jta) \
+ln -sf $(build-classpath jboss-transaction-1.2-api) \
        %{buildroot}%{homedir}/lib/jndi/
 
 for module in jetty-annotations jetty-client jetty-continuation jetty-deploy \
@@ -697,24 +734,6 @@ rm %{buildroot}%{homedir}/*.txt  %{buildroot}%{homedir}/*.html
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=845993
 ln -sf %{rundir} %{buildroot}%{homedir}/work
 
-# Resources directory ought to be in /etc.
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=596611
-mv %{buildroot}/%{homedir}/resources %{buildroot}/%{confdir}
-
-
-# RPM cannot replace symlink with a directory, workaround this bug.
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=447156
-%pretrans -p <lua>
-if (posix.stat("%{homedir}/resources", "type") == "directory") then
-    posix.unlink("%{homedir}/resources/jetty-logging.properties")
-    posix.unlink("%{homedir}/resources/log4j.properties")
-    posix.rmdir("%{homedir}/resources")
-end
-if (posix.stat("%{confdir}/resources", "type") == "link") then
-    posix.unlink("%{confdir}/resources")
-end
-
-
 %pre
 # Add the "jetty" user and group
 getent group  %username &>/dev/null || groupadd -r -g %jtuid %username || :
@@ -722,9 +741,6 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
                              -d %homedir -M -s /sbin/nologin %username || :
 
 %post
-if [ ! -e %{homedir}/resources ]; then
-    ln -s %{confdir}/resources %{homedir}/resources
-fi
 %systemd_post jetty.service
 
 %preun
@@ -755,7 +771,6 @@ fi
 %dir %{jettylibdir}
 %dir %{jettycachedir}
 %{homedir}
-%ghost %{homedir}/resources
 %attr(755, jetty, jetty) %{logdir}
 %attr(755, jetty, jetty) %{tempdir}
 %ghost %dir %attr(755, jetty, jetty) %{rundir}
@@ -765,7 +780,7 @@ fi
 %dir %{_javadir}/%{name}
 
 %files project -f .mfiles-project
-%doc NOTICE.txt README.txt VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
+%doc NOTICE.txt README.TXT VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
 
 %files annotations -f .mfiles-jetty-annotations
 %files ant -f .mfiles-jetty-ant
@@ -791,21 +806,22 @@ fi
 %files server -f .mfiles-jetty-server
 %files servlet -f .mfiles-jetty-servlet
 %files servlets -f .mfiles-jetty-servlets
-%files overlay-deployer -f .mfiles-jetty-overlay-deployer
 %files start -f .mfiles-jetty-start
 %files util -f .mfiles-jetty-util
-%doc NOTICE.txt README.txt VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
+%doc NOTICE.txt README.TXT VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
 %doc LICENSE-MIT
 %files util-ajax -f .mfiles-jetty-util-ajax
 %files webapp -f .mfiles-jetty-webapp
 %files xml -f .mfiles-jetty-xml
-%files project -f .mfiles-project
 %files websocket-api -f .mfiles-websocket-api
 %files websocket-client -f .mfiles-websocket-client
 %files websocket-common -f .mfiles-websocket-common
 %files websocket-parent -f .mfiles-websocket-parent
 %files websocket-server -f .mfiles-websocket-server
 %files websocket-servlet -f .mfiles-websocket-servlet
+%files websocket-mux-extension -f .mfiles-websocket-mux-extension
+%files javax-websocket-client-impl -f .mfiles-javax-websocket-client-impl
+%files javax-websocket-server-impl -f .mfiles-javax-websocket-server-impl
 
 %if %{with nosql}
 %files nosql -f .mfiles-jetty-nosql
@@ -828,6 +844,9 @@ fi
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Wed Nov 27 2013 Michael Simacek <msimacek at redhat.com> - 9.1.0-1
+- Update to upstream version 9.1.0
+
 * Fri Oct 11 2013 Michal Srb <msrb at redhat.com> - 9.0.6-1
 - Update to upstream version 9.0.6
 - Install licenses with jetty-util subpackage
diff --git a/sources b/sources
index f367a72..69e085e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85a30df6cbc5ccb2535e4d76ec55ef7a  jetty-9.0.6.v20130930.tar.gz
+c28c640ed6d883f270def8a9bb692fff  jetty-9.1.0.v20131115.tar.gz
