Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Michael Simacek
40c22c357d Workaround NPE in shade-plugin 2018-07-02 16:53:02 +02:00
Michael Simacek
b8b5d7a466 Use ASM 5 2018-07-02 16:41:32 +02:00
3 changed files with 44 additions and 1 deletions

View file

@ -1,7 +1,7 @@
From e1f6d2f9749b6a04a3b7d163d17df41751fb8977 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 2 Jun 2015 22:52:21 +0200
Subject: [PATCH] Fedora jetty.home
Subject: [PATCH 1/2] Fedora jetty.home
---
.../eclipse/jetty/start/config/CommandLineConfigSource.java | 3 +++

View file

@ -0,0 +1,37 @@
From 0104a128dc2354c3805278a9a0092c7f2f12ceff Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 2 Jul 2018 14:39:39 +0200
Subject: [PATCH 2/2] Default to ASM 5
---
.../org/eclipse/jetty/annotations/AnnotationParser.java | 7 +------
1 file changed, 1 insertion(+), 6 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 2c232c5..a87ff6b 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,7 +69,7 @@ import org.objectweb.asm.Opcodes;
public class AnnotationParser
{
private static final Logger LOG = Log.getLogger(AnnotationParser.class);
- protected static int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api
+ protected static int ASM_OPCODE_VERSION = Opcodes.ASM5; //compatibility of api
/**
* Map of classnames scanned and the first location from which scan occurred
@@ -112,11 +112,6 @@ public class AnnotationParser
asmVersion = Opcodes.ASM5;
break;
}
- case 6:
- {
- asmVersion = Opcodes.ASM6;
- break;
- }
default:
{
LOG.warn("Unrecognized runtime asm version, assuming {}", asmVersion);
--
2.17.1

View file

@ -64,6 +64,8 @@ Source5: %{name}.service
Source6: LICENSE-MIT
Patch1: 0001-Fedora-jetty.home.patch
# Fedora 27 doesn't have asm 6 yet
Patch2: 0002-Default-to-ASM-5.patch
BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:javax.servlet-api)
@ -602,6 +604,7 @@ License: (ASL 2.0 or EPL) and MIT
%setup -q -n %{name}.project-%{name}-%{version}%{addver}
%patch1 -p1
%patch2 -p1
find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
@ -645,6 +648,9 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
# it doesn't like the trailing semicolon
sed -i 's#;</Export-Package>#</Export-Package>#' jetty-http2/http2-common/pom.xml
# Workaround NPE in shade-plugin
%pom_xpath_set -r pom:createSourcesJar false
# only used for integration tests
%pom_remove_plugin :maven-invoker-plugin jetty-jspc-maven-plugin