Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-05 13:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2957 from eclipse/jetty-9.4.x-2941-asm_jdk11

Browse Source 
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
This commit is contained in:
Simone Bordet 2018-11-01 17:49:22 +01:00 committed by GitHub
commit d33f65d322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-annotations/pom.xml
View File

@ -20,7 +20,7 @@
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>org.objectweb.asm;version="[5.0,7)",*</Import-Package> <Import-Package>org.objectweb.asm;version="5",*</Import-Package>
<Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional</Require-Capability> <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional</Require-Capability>
</instructions> </instructions>
</configuration> </configuration>

9
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -69,8 +69,8 @@ import org.objectweb.asm.Opcodes;
public class AnnotationParser public class AnnotationParser
{ {
private static final Logger LOG = Log.getLogger(AnnotationParser.class); private static final Logger LOG = Log.getLogger(AnnotationParser.class);
private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api
private static final String ASM_OPCODE_VERSION_STR = "ASM6"; private static final String ASM_OPCODE_VERSION_STR = "ASM7";
/** /**
* Map of classnames scanned and the first location from which scan occurred * Map of classnames scanned and the first location from which scan occurred
@ -115,6 +115,11 @@ public class AnnotationParser
asmVersion = Opcodes.ASM6; asmVersion = Opcodes.ASM6;
break; break;
} }
case 7:
{
asmVersion = Opcodes.ASM7;
break;
}
default: default:
{ {
LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR); LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR);

2
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -80,7 +80,7 @@
javax.servlet.http;version="[3.1,3.2)", javax.servlet.http;version="[3.1,3.2)",
javax.transaction;version="1.1.0";resolution:=optional, javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional, javax.transaction.xa;version="1.1.0";resolution:=optional,
org.objectweb.asm;version=4;resolution:=optional, org.objectweb.asm;version="5";resolution:=optional,
org.osgi.framework, org.osgi.framework,
org.osgi.service.cm;version="1.2.0", org.osgi.service.cm;version="1.2.0",
org.osgi.service.packageadmin, org.osgi.service.packageadmin,

1
jetty-osgi/pom.xml
View File

@ -15,6 +15,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<asm.version>6.2</asm.version>
<osgi-version>3.6.0.v20100517</osgi-version> <osgi-version>3.6.0.v20100517</osgi-version>
<osgi-services-version>3.2.100.v20100503</osgi-services-version> <osgi-services-version>3.2.100.v20100503</osgi-services-version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version> <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>

2
pom.xml
View File

@ -26,7 +26,7 @@
<!-- default values are unsupported, but required to be defined for reactor sanity reasons --> <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version> <alpn.version>undefined</alpn.version>
<conscrypt.version>1.1.4</conscrypt.version> <conscrypt.version>1.1.4</conscrypt.version>
<asm.version>6.2</asm.version> <asm.version>7.0</asm.version>
<jmh.version>1.21</jmh.version> <jmh.version>1.21</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>1.2.0</tycho-version> <tycho-version>1.2.0</tycho-version>