[jetty/f19] Update to upstream version 9.0.3
Michal Srb
msrb at fedoraproject.org
Thu May 9 11:20:45 UTC 2013
commit 4669eb7341acfe387c4ef32b6c4453a793720a72
Author: Michal Srb <msrb at redhat.com>
Date: Thu May 9 13:19:17 2013 +0200
Update to upstream version 9.0.3
.gitignore | 1 +
jetty.spec | 16 +++++++++++++---
sources | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80aebd5..549b8a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ jetty-6.1.26-src.zip
/jetty-9.0.0.RC3.tar.gz
/jetty-9.0.0.v20130308.tar.gz
/jetty-9.0.2.v20130417.tar.gz
+/jetty-9.0.3.v20130506.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 99b90a9..47722e4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20130417
+%global addver v20130506
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,7 +54,7 @@
%endif
Name: jetty
-Version: 9.0.2
+Version: 9.0.3
Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
@@ -455,7 +455,7 @@ License: (ASL 2.0 or EPL) and MIT
%{summary}.
%prep
-%setup -q -n %{jettyname}.project-%{jettyname}-%{version}.%{addver}
+%setup -q -n %{jettyname}-%{version}.%{addver}
for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
@@ -481,10 +481,17 @@ find . -name "*.class" -exec rm {} \;
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jetty-webapp']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-proxy-webapp']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='example-async-rest-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jaas-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jndi-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-spec-webapp']]" jetty-distribution/pom.xml
# Missing jars (jetty-setuid-java-1.0.0.jar,jetty-setuid-java-1.0.0-config.jar)
%pom_xpath_remove "pom:execution[pom:id[text()='unpack-setuid-config']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-distribution/pom.xml
+# test-jaas-webapp artifact is disabled
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-jaas-config']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-jndi-config']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-spec-config']]" jetty-distribution/pom.xml
# We don't have this plugin yet
%pom_remove_plugin :findbugs-maven-plugin jetty-websocket/pom.xml
@@ -789,6 +796,9 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc NOTICE.txt LICENSE*
%changelog
+* Thu May 09 2013 Michal Srb <msrb at redhat.com> - 9.0.3-1
+- Update to upstream version 9.0.3
+
* Mon Apr 22 2013 Michal Srb <msrb at redhat.com> - 9.0.2-1
- Update to upstream version 9.0.2
diff --git a/sources b/sources
index fb0cb46..f8a3788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b93bf93b1ef3f2c96f272742d3fcc154 jetty-9.0.2.v20130417.tar.gz
+c012ca221b6f41a760a2900dbd912f0b jetty-9.0.3.v20130506.tar.gz
More information about the scm-commits
mailing list