commit 1d898f2e004067d45fe521fc44dfa516adab8634
Author: Michael Simacek <msimacek at redhat.com>
Date: Wed Feb 12 17:12:23 2014 +0100
Update to upstream version 9.1.2
.gitignore | 1 +
jetty.spec | 20 +++++++++++---------
sources | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61ecf06..1ef957e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ jetty-6.1.26-src.zip
/jetty-9.0.6.v20130930.tar.gz
/jetty-9.1.0.v20131115.tar.gz
/jetty-9.1.1.v20140108.tar.gz
+/jetty-9.1.2.v20140210.tar.gz
diff --git a/jetty.spec b/jetty.spec
index b66ff99..8967019 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20140108
+%global addver v20140210
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,7 +54,7 @@
%endif
Name: jetty
-Version: 9.1.1
+Version: 9.1.2
Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
@@ -171,6 +171,7 @@ Obsoletes: %{name}-http-spi < %{version}-%{release}
Obsoletes: %{name}-nested < %{version}-%{release}
Obsoletes: %{name}-overlay-deployer < %{version}-%{release}
Obsoletes: %{name}-policy < %{version}-%{release}
+Obsoletes: %{name}-websocket-mux-extension < %{version}-%{release}
%description
%global desc \
@@ -416,12 +417,6 @@ 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
-%{extdesc} %{summary}.
-
%package javax-websocket-client-impl
Summary: javax-websocket-client-impl module for Jetty
@@ -515,6 +510,10 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_dep "org.eclipse.jetty.toolchain:jetty-jsp-jdt" jetty-distribution
%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi
+# licensing issues
+%pom_remove_dep "org.glassfish.web:javax.servlet.jsp.jstl" jetty-jsp
+%pom_remove_dep "org.glassfish.web:javax.servlet.jsp.jstl" jetty-distribution
+
%pom_remove_plugin ":clirr-maven-plugin" jetty-websocket
%pom_remove_plugin ":maven-eclipse-plugin" jetty-osgi
@@ -819,7 +818,6 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%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
@@ -844,6 +842,10 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc NOTICE.txt LICENSE*
%changelog
+* Wed Feb 12 2014 Michael Simacek <msimacek at redhat.com> - 9.1.2-1
+- Update to upstream version 9.1.2
+- Remove subpackage websocket-mux-extension (unstable, removed upstream)
+
* Fri Jan 10 2014 Michael Simacek <msimacek at redhat.com> - 9.1.1-1
- Update to upstream version 9.1.1
- Install .mod files
diff --git a/sources b/sources
index 2bd52ea..47f8258 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4683544a637abdce1d68071f0d3ed96e jetty-9.1.1.v20140108.tar.gz
+cf417c69b8640eb17ffe9d0f59f41eca jetty-9.1.2.v20140210.tar.gz