[jetty] Update to upstream version 9.2.2
Michael Šimáček
msimacek at fedoraproject.org
Thu Aug 28 14:10:09 UTC 2014
commit a043d4fbdf4bcd74673632658edc94b2ef02f2e5
Author: Michael Simacek <msimacek at redhat.com>
Date: Thu Aug 28 15:35:13 2014 +0200
Update to upstream version 9.2.2
.gitignore | 1 +
0001-glassfish-jsp-compatibility.patch | 44 ++++++++++++++++++++++++++++++++
jetty.spec | 30 +++++++++++++--------
sources | 2 +-
4 files changed, 64 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d8a9b5..56c40da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ jetty-6.1.26-src.zip
/jetty-9.1.5.v20140505.tar.gz
/jetty-9.2.0.v20140526.tar.gz
/jetty-9.2.1.v20140609.tar.gz
+/jetty-9.2.2.v20140723.tar.gz
diff --git a/0001-glassfish-jsp-compatibility.patch b/0001-glassfish-jsp-compatibility.patch
new file mode 100644
index 0000000..fb8a261
--- /dev/null
+++ b/0001-glassfish-jsp-compatibility.patch
@@ -0,0 +1,44 @@
+From 74ea686414c6b5a788a82bf520e5b5ce84270603 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Tue, 12 Aug 2014 13:51:49 +0200
+Subject: [PATCH] glassfish-jsp compatibility
+
+---
+ .../main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
+index 3e524b0..3132743 100644
+--- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
++++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
+@@ -33,6 +33,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Set;
+ import java.util.regex.Pattern;
++import java.lang.reflect.Field;
+
+ import org.apache.jasper.JspC;
+ import org.apache.maven.artifact.Artifact;
+@@ -90,9 +91,17 @@ public class JspcMojo extends AbstractMojo
+ */
+ public static class JettyJspC extends JspC
+ {
+- public void setClassLoader (ClassLoader loader)
++ public void setClassLoader (URLClassLoader loader)
+ {
+- this.loader = loader;
++ try {
++ Field loaderField = JspC.class.getDeclaredField("loader");
++ loaderField.setAccessible(true);
++ loaderField.set(this, loader);
++ } catch (NoSuchFieldException e) {
++ throw new RuntimeException(e);
++ } catch (IllegalAccessException e) {
++ throw new RuntimeException(e);
++ }
+ }
+ }
+
+--
+1.9.3
+
diff --git a/jetty.spec b/jetty.spec
index 8f114d8..7f77bcc 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20140609
+%global addver v20140723
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,7 +54,7 @@
%endif
Name: jetty
-Version: 9.2.1
+Version: 9.2.2
Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
@@ -68,6 +68,8 @@ Source5: %{name}.service
# MIT license text taken from Utf8Appendable.java
Source6: LICENSE-MIT
+Patch1: 0001-glassfish-jsp-compatibility.patch
+
BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
BuildRequires: jboss-transaction-1.2-api
@@ -477,6 +479,13 @@ Summary: osgi-boot-jsp module for Jetty
%endif # with osgi
+%package quickstart
+Summary: quickstart module for Jetty
+
+%description quickstart
+%{extdesc} %{summary}.
+
+
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
@@ -491,17 +500,12 @@ License: (ASL 2.0 or EPL) and MIT
find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
+%patch1 -p1
+
# 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_change_dep -r "javax.transaction:javax.transaction-api" "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec"
%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
@@ -533,8 +537,6 @@ find . -name "*.class" -exec rm {} \;
# and also xmvn currently doesn't support .war
%pom_disable_module tests
%pom_disable_module examples
-%pom_disable_module jetty-quickstart
-%pom_remove_dep :jetty-quickstart jetty-distribution
%pom_disable_module aggregates/jetty-all
%pom_disable_module test-jetty-osgi jetty-osgi/pom.xml
%pom_disable_module test-jetty-osgi-context jetty-osgi/pom.xml
@@ -841,6 +843,7 @@ exit 0
%files monitor -f .mfiles-jetty-monitor
%files plus -f .mfiles-jetty-plus
%files proxy -f .mfiles-jetty-proxy
+%files quickstart -f .mfiles-jetty-quickstart
%files rewrite -f .mfiles-jetty-rewrite
%files security -f .mfiles-jetty-security
%files server -f .mfiles-jetty-server
@@ -882,6 +885,9 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Tue Jul 29 2014 Michael Simacek <msimacek at redhat.com> - 9.2.2-1
+- Update to upstream version 9.2.2
+
* Fri Jun 13 2014 Michael Simacek <msimacek at redhat.com> - 9.2.1-1
- Update to upstream version 9.2.1
diff --git a/sources b/sources
index 5e5b5be..ff0b57b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18845cdb25571b7372935b2ec87d6840 jetty-9.2.1.v20140609.tar.gz
+22645186f09be7ce36852e9b12dea23e jetty-9.2.2.v20140723.tar.gz
More information about the scm-commits
mailing list