Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2020-08-21 10:46:56 +02:00
parent 311bcf42a5 728daadd92
commit 407d26206d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
pom.xml
View File

@ -35,7 +35,7 @@
<inject-api.version>2.0.0-RC2</inject-api.version> <inject-api.version>2.0.0-RC2</inject-api.version>
<infinispan.version>9.4.8.Final</infinispan.version> <infinispan.version>9.4.8.Final</infinispan.version>
<conscrypt.version>2.4.0</conscrypt.version> <conscrypt.version>2.4.0</conscrypt.version>
<asm.version>7.3.1</asm.version> <asm.version>8.0.1</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.4.0</tycho-version> <tycho-version>1.4.0</tycho-version>