diff --git a/.gitignore b/.gitignore index 85b4868..9c29f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jetty-9.4.19.v20190610.tar.gz +SOURCES/jetty-9.4.30.v20200611.tar.gz diff --git a/0001-Distro-jetty.home.patch b/0001-Distro-jetty.home.patch new file mode 100644 index 0000000..7795ae2 --- /dev/null +++ b/0001-Distro-jetty.home.patch @@ -0,0 +1,25 @@ +From 7e9bed1ca10901a3cf28775d9563570e94e2280b Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Mon, 9 Sep 2019 12:42:10 +0100 +Subject: [PATCH] Distro jetty.home + +--- + .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java +index 792413e..5e5cab9 100644 +--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java ++++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java +@@ -120,6 +120,8 @@ public class CommandLineConfigSource implements ConfigSource + try + { + Path home = new File(new URI(m.group(1))).getParentFile().toPath(); ++ if (home.endsWith("/usr/share/java/jetty")) ++ home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath(); + setProperty(BaseHome.JETTY_HOME, home.toString(), ORIGIN_INTERNAL_FALLBACK); + return home; + } +-- +2.20.1 + diff --git a/jetty.spec b/jetty.spec index c1a71e8..a0d0132 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,17 +40,17 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20190610 +%global addver .v20200611 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet # thermostat needs: server, jaas, webapp # above modules need: jmx, xml -%bcond_with jp_minimal +%bcond_without jp_minimal Name: jetty -Version: 9.4.19 -Release: 1%{addver}%{?dist} +Version: 9.4.30 +Release: 2%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -63,7 +63,7 @@ Source5: %{name}.service # MIT license text taken from Utf8Appendable.java Source6: LICENSE-MIT -Patch1: 0001-Fedora-jetty.home.patch +Patch1: 0001-Distro-jetty.home.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -117,7 +117,6 @@ BuildRequires: mvn(org.mongodb:mongo-java-driver) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.springframework:spring-beans) BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) @@ -132,7 +131,7 @@ BuildRequires: junit5 # duplicate providers, choose one BuildRequires: jboss-websocket-1.0-api Requires: jboss-websocket-1.0-api -%endif # without jp_minimal +%endif BuildArch: noarch @@ -165,7 +164,6 @@ Requires: %{name}-security = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: %{name}-servlet = %{version}-%{release} Requires: %{name}-servlets = %{version}-%{release} -Requires: %{name}-spring = %{version}-%{release} Requires: %{name}-start = %{version}-%{release} Requires: %{name}-unixsocket = %{version}-%{release} Requires: %{name}-util = %{version}-%{release} @@ -197,10 +195,8 @@ Requires(pre): shadow-utils Provides: group(%username) = %jtuid Provides: user(%username) = %jtuid -%endif # without jp_minimal +%endif -# (Added in F25) -Obsoletes: %{name}-monitor < 9.4.0-0.4 # Hazelcast in Fedora is too old for jetty to build against (Added in F29) Obsoletes: %{name}-hazelcast < 9.4.18-1 # Infinispan in Fedora is too old for jetty to build against (Added in F31) @@ -210,6 +206,49 @@ Obsoletes: %{name}-osgi-alpn < 9.4.18-1 Obsoletes: %{name}-osgi-boot < 9.4.18-1 Obsoletes: %{name}-osgi-boot-jsp < 9.4.18-1 Obsoletes: %{name}-osgi-boot-warurl < 9.4.18-1 +# Spring framework removed from Fedora (Added in F32) +Obsoletes: %{name}-spring < 9.4.24-1 + +%if %{with jp_minimal} +# Remove left-over packages that would have broken deps when built in minimal mode +Obsoletes: %{name}-project < 9.4.20-1 +Obsoletes: %{name}-annotations < 9.4.20-1 +Obsoletes: %{name}-ant < 9.4.20-1 +Obsoletes: %{name}-cdi < 9.4.20-1 +Obsoletes: %{name}-deploy < 9.4.20-1 +Obsoletes: %{name}-fcgi-client < 9.4.20-1 +Obsoletes: %{name}-fcgi-server < 9.4.20-1 +Obsoletes: %{name}-http-spi < 9.4.20-1 +Obsoletes: %{name}-jaspi < 9.4.20-1 +Obsoletes: %{name}-jndi < 9.4.20-1 +Obsoletes: %{name}-jsp < 9.4.20-1 +Obsoletes: %{name}-jstl < 9.4.20-1 +Obsoletes: %{name}-jspc-maven-plugin < 9.4.20-1 +Obsoletes: %{name}-maven-plugin < 9.4.20-1 +Obsoletes: %{name}-plus < 9.4.20-1 +Obsoletes: %{name}-proxy < 9.4.20-1 +Obsoletes: %{name}-quickstart < 9.4.20-1 +Obsoletes: %{name}-rewrite < 9.4.20-1 +Obsoletes: %{name}-servlets < 9.4.20-1 +Obsoletes: %{name}-start < 9.4.20-1 +Obsoletes: %{name}-unixsocket < 9.4.20-1 +Obsoletes: %{name}-util-ajax < 9.4.20-1 +Obsoletes: %{name}-websocket-api < 9.4.20-1 +Obsoletes: %{name}-websocket-client < 9.4.20-1 +Obsoletes: %{name}-websocket-common < 9.4.20-1 +Obsoletes: %{name}-websocket-server < 9.4.20-1 +Obsoletes: %{name}-websocket-servlet < 9.4.20-1 +Obsoletes: %{name}-javax-websocket-client-impl < 9.4.20-1 +Obsoletes: %{name}-javax-websocket-server-impl < 9.4.20-1 +Obsoletes: %{name}-alpn-client < 9.4.20-1 +Obsoletes: %{name}-alpn-server < 9.4.20-1 +Obsoletes: %{name}-http2-client < 9.4.20-1 +Obsoletes: %{name}-http2-common < 9.4.20-1 +Obsoletes: %{name}-http2-hpack < 9.4.20-1 +Obsoletes: %{name}-http2-http-client-transport < 9.4.20-1 +Obsoletes: %{name}-http2-server < 9.4.20-1 +Obsoletes: %{name}-nosql < 9.4.20-1 +%endif %description %global desc \ @@ -228,6 +267,7 @@ Jetty is available on all Java supported platforms. This package contains # packages in jp_minimal set + %package client Summary: client module for Jetty @@ -320,6 +360,7 @@ Summary: xml module for Jetty %if %{without jp_minimal} + %package project Summary: POM files for Jetty Obsoletes: %{name}-websocket-parent < 9.4.0-0.4 @@ -414,12 +455,6 @@ Summary: servlets module for Jetty %description servlets %{extdesc} %{summary}. -%package spring -Summary: spring module for Jetty - -%description spring -%{extdesc} %{summary}. - %package start Summary: start module for Jetty @@ -540,7 +575,7 @@ Summary: jstl module for Jetty %description jstl %{extdesc} %{summary}. -%endif # without jp_minimal +%endif %package javadoc Summary: Javadoc for %{name} @@ -559,6 +594,7 @@ find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; # Plugins irrelevant or harmful to building the package +%pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin -r :findbugs-maven-plugin %pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin -r :clirr-maven-plugin @@ -587,9 +623,6 @@ find . -name "*.class" -exec rm {} \; %pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common -# Old version of jetty not available for tests, so use this version -%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp - # provided by glassfish-jsp-api that has newer version %pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api @@ -643,6 +676,9 @@ sed -i '/^\s*\*.*