From 880203df1686f451fa86a0b3065851521adad06b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Apr 25 2019 15:13:05 +0000 Subject: Update to latest upstream release Stop building and obsolete the infinispan module --- diff --git a/.gitignore b/.gitignore index f5d342b..89e48ab 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ jetty-6.1.26-src.zip /jetty-9.4.11.v20180605.tar.gz /jetty-9.4.14.v20181114.tar.gz /jetty-9.4.15.v20190215.tar.gz +/jetty-9.4.17.v20190418.tar.gz diff --git a/0002-Allow-building-with-ASM6-on-Fedora-29.patch b/0002-Allow-building-with-ASM6-on-Fedora-29.patch deleted file mode 100644 index 3bf22f2..0000000 --- a/0002-Allow-building-with-ASM6-on-Fedora-29.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 743dedbd36be295bcc4952611cc89c577ec0a693 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Thu, 6 Dec 2018 09:49:35 +0000 -Subject: [PATCH 2/2] Allow building with ASM6 on Fedora <= 29 - ---- - .../org/eclipse/jetty/annotations/AnnotationParser.java | 9 ++------- - .../eclipse/jetty/osgi/annotations/AnnotationParser.java | 2 +- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java -index a23b685..832ae20 100644 ---- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java -+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java -@@ -69,8 +69,8 @@ import org.objectweb.asm.Opcodes; - public class AnnotationParser - { - private static final Logger LOG = Log.getLogger(AnnotationParser.class); -- private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api -- private static final String ASM_OPCODE_VERSION_STR = "ASM7"; -+ private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api -+ private static final String ASM_OPCODE_VERSION_STR = "ASM6"; - - /** - * Map of classnames scanned and the first location from which scan occurred -@@ -115,11 +115,6 @@ public class AnnotationParser - asmVersion = Opcodes.ASM6; - break; - } -- case 7: -- { -- asmVersion = Opcodes.ASM7; -- break; -- } - default: - { - LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR); -diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java -index 00f0919..1350eb4 100644 ---- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java -+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java -@@ -49,7 +49,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa - - public AnnotationParser(int javaPlatform) - { -- super(javaPlatform, Opcodes.ASM7); -+ super(javaPlatform, Opcodes.ASM6); - } - - /** --- -2.19.1 - diff --git a/jetty.spec b/jetty.spec index 84ee61c..1cf19fc 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20190215 +%global addver .v20190418 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -49,7 +49,7 @@ %bcond_with jp_minimal Name: jetty -Version: 9.4.15 +Version: 9.4.17 Release: 1%{addver}%{?dist} Summary: Java Webserver and Servlet Container @@ -64,7 +64,6 @@ Source5: %{name}.service Source6: LICENSE-MIT Patch1: 0001-Fedora-jetty.home.patch -Patch2: 0002-Allow-building-with-ASM6-on-Fedora-29.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -116,7 +115,6 @@ BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-helper) BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services) -BuildRequires: mvn(org.infinispan:infinispan-core) BuildRequires: mvn(org.jboss.weld.servlet:weld-servlet-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) BuildRequires: mvn(org.ow2.asm:asm) @@ -177,7 +175,6 @@ Requires: %{name}-util = %{version}-%{release} Requires: %{name}-util-ajax = %{version}-%{release} Requires: %{name}-webapp = %{version}-%{release} Requires: %{name}-xml = %{version}-%{release} -Requires: %{name}-infinispan = %{version}-%{release} Requires: %{name}-cdi = %{version}-%{release} Requires: %{name}-websocket-api = %{version}-%{release} Requires: %{name}-websocket-client = %{version}-%{release} @@ -220,8 +217,10 @@ Obsoletes: %{name}-runner < 9.4.0-0.4 Obsoletes: %{name}-osgi-npn < 9.4.0-0.4 Obsoletes: %{name}-monitor < 9.4.0-0.4 -# Hazelcast in Fedora is too old for jetty to build against -Obsoletes: %{name}-hazelcast < 9.4.14-1 +# Hazelcast in Fedora is too old for jetty to build against (Added in F29) +Obsoletes: %{name}-hazelcast < %{version}-%{release} +# Infinispan in Fedora is too old for jetty to build against (Added in F31) +Obsoletes: %{name}-infinispan < %{version}-%{release} %description %global desc \ @@ -377,12 +376,6 @@ Summary: FastCGI client module for Jetty %description fcgi-server %{extdesc} %{summary}. -%package infinispan -Summary: infinispan module for Jetty - -%description infinispan -%{extdesc} %{summary}. - %package jaspi Summary: jaspi module for Jetty @@ -602,11 +595,6 @@ License: (ASL 2.0 or EPL) and MIT %patch1 -p1 -# ASM 7 is only available on F30+ -%if 0%{?fedora} > 0 && 0%{?fedora} < 30 -%patch2 -p1 -%endif - find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; @@ -683,6 +671,15 @@ sed -i '/^\s*\*.*