msimacek pushed to jetty (master). "Update to upstream version 9.3.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 15:45:50 UTC 2015
msimacek pushed to jetty (master). "Update to upstream version 9.3.0"
>From 4599fd85c98f7c7d0ba80867e26fa6af4ca4435c Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Tue, 24 Mar 2015 16:42:37 +0100
Subject: Update to upstream version 9.3.0
diff --git a/.gitignore b/.gitignore
index 3964234..5d65123 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ jetty-6.1.26-src.zip
/jetty-9.2.6.v20141205.tar.gz
/jetty-9.2.7.v20150116.tar.gz
/jetty-9.2.9.v20150224.tar.gz
+/jetty-9.3.0.M2.tar.gz
diff --git a/0001-glassfish-jsp-compatibility.patch b/0001-glassfish-jsp-compatibility.patch
deleted file mode 100644
index fb8a261..0000000
--- a/0001-glassfish-jsp-compatibility.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 098b2ce..9dbe871 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20150224
+%global addver M2
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,8 +54,8 @@
%endif
Name: jetty
-Version: 9.2.9
-Release: 3%{?dist}
+Version: 9.3.0
+Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -68,8 +68,6 @@ 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
@@ -82,6 +80,7 @@ BuildRequires: glassfish-el-api
BuildRequires: glassfish-jsp
BuildRequires: glassfish-jsp-api
BuildRequires: tomcat-taglibs-standard
+BuildRequires: tomcat-lib
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
BuildRequires: javapackages-tools >= 0.7.0
@@ -122,6 +121,7 @@ BuildRequires: jetty-assembly-descriptors
BuildRequires: jetty-test-policy
BuildRequires: jetty-artifact-remote-resources
BuildRequires: jetty-schemas
+BuildRequires: jetty-alpn-api
BuildArch: noarch
@@ -137,6 +137,8 @@ Requires: jetty-io = %{version}-%{release}
Requires: jetty-jaas = %{version}-%{release}
Requires: jetty-jmx = %{version}-%{release}
Requires: jetty-jndi = %{version}-%{release}
+Requires: jetty-jsp = %{version}-%{release}
+Requires: jetty-jstl = %{version}-%{release}
Requires: jetty-plus = %{version}-%{release}
Requires: jetty-proxy = %{version}-%{release}
Requires: jetty-rewrite = %{version}-%{release}
@@ -196,7 +198,6 @@ This package contains
%package project
Summary: POM files for Jetty
-Group: Development/Libraries
%description project
%{extdesc} %{summary}.
@@ -493,10 +494,63 @@ Summary: quickstart module for Jetty
%description quickstart
%{extdesc} %{summary}.
+%package alpn-client
+Summary: alpn-client module for Jetty
+
+%description alpn-client
+%{extdesc} %{summary}.
+
+%package alpn-server
+Summary: alpn-server module for Jetty
+
+%description alpn-server
+%{extdesc} %{summary}.
+
+%package osgi-alpn
+Summary: osgi-alpn module for Jetty
+
+%description osgi-alpn
+%{extdesc} %{summary}.
+
+%package jstl
+Summary: jstl module for Jetty
+
+%description jstl
+%{extdesc} %{summary}.
+
+%package http2-client
+Summary: http2-client module for Jetty
+
+%description http2-client
+%{extdesc} %{summary}.
+
+%package http2-common
+Summary: http2-common module for Jetty
+
+%description http2-common
+%{extdesc} %{summary}.
+
+%package http2-hpack
+Summary: http2-hpack module for Jetty
+
+%description http2-hpack
+%{extdesc} %{summary}.
+
+%package http2-http-client-transport
+Summary: http2-http-client-transport module for Jetty
+
+%description http2-http-client-transport
+%{extdesc} %{summary}.
+
+%package http2-server
+Summary: http2-server module for Jetty
+
+%description http2-server
+%{extdesc} %{summary}.
+
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
License: (ASL 2.0 or EPL) and MIT
@@ -508,19 +562,12 @@ License: (ASL 2.0 or EPL) and MIT
find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
-%patch1 -p1
-
%pom_xpath_set -r 'pom:goal[text()="xdoc"]' report
# Use proper groupId for apache ant
%pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml
%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
-%pom_add_dep "org.glassfish.web:javax.el" jetty-distribution
-%pom_remove_dep "org.eclipse.jetty.toolchain:jetty-jsp-jdt" jetty-distribution
%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi
# glassfish-jstl has licensing issues
@@ -540,6 +587,8 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_plugin ":jetty-version-maven-plugin"
%pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-distribution
+# it doesn't like the trailing semicolon
+sed -i 's#;</Export-Package>#</Export-Package>#' jetty-http2/http2-common/pom.xml
# Disable test and example artifacts
# they need more dependencies then we have time for right now :-)
@@ -550,6 +599,7 @@ find . -name "*.class" -exec rm {} \;
%pom_disable_module test-jetty-osgi jetty-osgi/pom.xml
%pom_disable_module test-jetty-osgi-context jetty-osgi/pom.xml
%pom_disable_module test-jetty-osgi-webapp jetty-osgi/pom.xml
+%pom_disable_module http2-alpn-tests jetty-http2/pom.xml
# Since tests are disabled, we don't have some jars
%pom_remove_dep :test-jetty-webapp jetty-distribution/pom.xml
@@ -595,31 +645,7 @@ find . -name "*.class" -exec rm {} \;
# manually before building distribution
%pom_xpath_remove "pom:execution[pom:id[text()='unpack-config-deps']]" jetty-distribution
-# Disable SPDY for now as there are missing dependencies. SPDY needs
-# Next Protocol Negotiation TLS Extension (NPN) for OpenJDK 7 or
-# greater. We don't have this extension in Fedora.
-# See: http://wiki.eclipse.org/Jetty/Feature/NPN
-%pom_disable_module jetty-spdy
-%pom_remove_dep org.eclipse.jetty.spdy: jetty-distribution
-%pom_disable_module jetty-alpn
-%pom_disable_module jetty-osgi-alpn jetty-osgi
-%pom_remove_dep :jetty-alpn-server jetty-distribution
-
-# requiring artifacts which are a copy of Tomcat 8 jasper with dependencies
-# removed. We don't have Tomcat 8 in Fedora yet, so I try to bend it to use
-# glassfish
-%pom_disable_module apache-jsp
-%pom_change_dep -r org.eclipse.jetty:apache-jsp org.glassfish.web:javax.servlet.jsp
-
-# qutoing readme.txt: "This empty jar file is purely to work around a problem
-# with the Maven Dependency plugin". We don't copy deps, so we don't need this
-# workaround
-%pom_disable_module apache-jstl
-%pom_change_dep -r org.eclipse.jetty:apache-jstl javax.servlet:jstl
-
-# org.mortbay.jasper:apache-el is just a copy of tomcat el with dependencies
-# removed
-%pom_change_dep -r org.mortbay.jasper:apache-el org.glassfish:javax.el
+%pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper
# Remove when alias is added to ecj
%pom_change_dep -r 'org.eclipse.jetty.orbit:org.eclipse.jdt.core' 'org.eclipse.jdt:core'
@@ -645,8 +671,6 @@ cp %{SOURCE6} .
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-distribution/src/main/resources/etc/jetty-started.xml
-sed -i '/jsp-impl=/s/apache/glassfish/' jetty-distribution/src/main/resources/modules/jsp.mod
-
# Looks like all CDDL licensed content in tarball has been replaced,
# we don't need to install this license
rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
@@ -657,8 +681,12 @@ rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
%mvn_package :jetty-project project
%mvn_package :fcgi-parent __noinstall
+%mvn_package :http2-parent __noinstall
+%mvn_package :jetty-alpn-parent __noinstall
%mvn_package :jetty-runner __noinstall
+%mvn_package :apache-jsp jetty-jsp
+
# we don't have all necessary dependencies to run tests
# missing test dep: org.eclipse.jetty.toolchain:jetty-test-helper
%mvn_build -f -s
@@ -674,7 +702,6 @@ done)
%mvn_install
# dirs
-install -dm 755 %{buildroot}%{_javadir}/%{name}
%if %{with service}
install -dm 755 %{buildroot}%{_bindir}
install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d
@@ -723,22 +750,24 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
-build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
- glassfish-el tomcat-taglibs-standard/taglibs-standard-compat \
- tomcat-taglibs-standard/taglibs-standard-impl glassfish-jsp \
- glassfish-jsp-api ecj
+build-jar-repository %{buildroot}%{homedir}/lib/apache-jsp \
+ jetty/apache-jsp tomcat/jasper tomcat/tomcat-juli \
+ tomcat/tomcat-jsp-2.3-api tomcat/tomcat-api tomcat/tomcat-util \
+ tomcat-taglibs-standard/taglibs-standard-compat \
+ tomcat-taglibs-standard/taglibs-standard-impl \
+ tomcat/tomcat-util-scan ecj glassfish-el-api glassfish-el
ln -sf $(build-classpath jboss-transaction-1.2-api) \
%{buildroot}%{homedir}/lib/jndi/
-for jar in %{_javadir}/%{name}/*.jar; do
+for jar in %{buildroot}%{_javadir}/%{name}/*.jar; do
mod=`basename -s .jar $jar`
if [[ $mod == *-websocket* ]]; then
target="%{buildroot}%{homedir}/lib/websocket/${mod%%jetty-}-%{version}.%{addver}.jar"
else
target="%{buildroot}%{homedir}/lib/$mod-%{version}.%{addver}.jar"
fi
- ln -s $jar $target
+ ln -s "${jar##%{buildroot}}" $target
done
( cat << EO_RC
@@ -778,7 +807,7 @@ ln -sf %{rundir} %{buildroot}%{homedir}/work
# replace the startup script with ours
cp -p %{SOURCE1} %{buildroot}%{homedir}/bin/jetty.sh
-ln -s lib/%{name}-start-%{version}.%{addver}.jar %{buildroot}%{homedir}/start.jar
+ln -s %{_javadir}/%{name}/%{name}-start.jar %{buildroot}%{homedir}/start.jar
%pre
# Add the "jetty" user and group
@@ -852,6 +881,7 @@ exit 0
%files jmx -f .mfiles-jetty-jmx
%files jndi -f .mfiles-jetty-jndi
%files jsp -f .mfiles-jetty-jsp
+%files jstl -f .mfiles-apache-jstl
%files jspc-maven-plugin -f .mfiles-jetty-jspc-maven-plugin
%files maven-plugin -f .mfiles-jetty-maven-plugin
%files monitor -f .mfiles-jetty-monitor
@@ -878,6 +908,14 @@ exit 0
%files websocket-servlet -f .mfiles-websocket-servlet
%files javax-websocket-client-impl -f .mfiles-javax-websocket-client-impl
%files javax-websocket-server-impl -f .mfiles-javax-websocket-server-impl
+%files alpn-client -f .mfiles-jetty-alpn-client
+%files alpn-server -f .mfiles-jetty-alpn-server
+%files osgi-alpn -f .mfiles-jetty-osgi-alpn
+%files http2-client -f .mfiles-http2-client
+%files http2-common -f .mfiles-http2-common
+%files http2-hpack -f .mfiles-http2-hpack
+%files http2-http-client-transport -f .mfiles-http2-http-client-transport
+%files http2-server -f .mfiles-http2-server
%if %{with nosql}
%files nosql -f .mfiles-jetty-nosql
@@ -899,6 +937,10 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Tue Mar 24 2015 Michael Simacek <msimacek at redhat.com> - 9.3.0-1
+- Update to upstream version 9.3.0
+- Fix symlinks
+
* Tue Mar 17 2015 Michael Simacek <msimacek at redhat.com> - 9.2.9-3
- Use report goal of maven-plugin-plugin instead of xdoc
diff --git a/sources b/sources
index 8b78ac5..57ba7e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-004f5eb773f772ff62ff11d445646ad3 jetty-9.2.9.v20150224.tar.gz
+c24295c75c3b9915efea228548a45317 jetty-9.3.0.M2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/jetty.git/commit/?h=master&id=4599fd85c98f7c7d0ba80867e26fa6af4ca4435c
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list