opendev/gerrit
Code Issues Proposed changes

Merge changes I33e1f34e,I4e47fb1e

Browse Source 
* changes:
  JarScanner: Use ASM7 opcodes
  Upgrade asm to 7.0
This commit is contained in:
David Ostrovsky
2018-11-03 05:23:34 +00:00
committed by Gerrit Code Review
parent 0ff5bceaa2 5f98ce9f2b
commit ecea76a3bc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WORKSPACE
View File

@@ -586,36 +586,36 @@ maven_jar(
sha1 = "5e3bda828a80c7a21dfbe2308d1755759c2fd7b4", sha1 = "5e3bda828a80c7a21dfbe2308d1755759c2fd7b4",
) )
OW2_VERS = "6.2.1" OW2_VERS = "7.0"
maven_jar( maven_jar(
name = "ow2-asm", name = "ow2-asm",
artifact = "org.ow2.asm:asm:" + OW2_VERS, artifact = "org.ow2.asm:asm:" + OW2_VERS,
sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7", sha1 = "d74d4ba0dee443f68fb2dcb7fcdb945a2cd89912",
) )
maven_jar( maven_jar(
name = "ow2-asm-analysis", name = "ow2-asm-analysis",
artifact = "org.ow2.asm:asm-analysis:" + OW2_VERS, artifact = "org.ow2.asm:asm-analysis:" + OW2_VERS,
sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d", sha1 = "4b310d20d6f1c6b7197a75f1b5d69f169bc8ac1f",
) )
maven_jar( maven_jar(
name = "ow2-asm-commons", name = "ow2-asm-commons",
artifact = "org.ow2.asm:asm-commons:" + OW2_VERS, artifact = "org.ow2.asm:asm-commons:" + OW2_VERS,
sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3", sha1 = "478006d07b7c561ae3a92ddc1829bca81ae0cdd1",
) )
maven_jar( maven_jar(
name = "ow2-asm-tree", name = "ow2-asm-tree",
artifact = "org.ow2.asm:asm-tree:" + OW2_VERS, artifact = "org.ow2.asm:asm-tree:" + OW2_VERS,
sha1 = "332b022092ecec53cdb6272dc436884b2d940615", sha1 = "29bc62dcb85573af6e62e5b2d735ef65966c4180",
) )
maven_jar( maven_jar(
name = "ow2-asm-util", name = "ow2-asm-util",
artifact = "org.ow2.asm:asm-util:" + OW2_VERS, artifact = "org.ow2.asm:asm-util:" + OW2_VERS,
sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339", sha1 = "18d4d07010c24405129a6dbb0e92057f8779fb9d",
) )
AUTO_VALUE_VERSION = "1.6.2" AUTO_VALUE_VERSION = "1.6.2"

4
java/com/google/gerrit/server/plugins/JarScanner.java
View File

@@ -195,7 +195,7 @@ public class JarScanner implements PluginContentScanner, AutoCloseable {
Collection<String> exports; Collection<String> exports;
private ClassData(Collection<String> exports) { private ClassData(Collection<String> exports) {
super(Opcodes.ASM6); super(Opcodes.ASM7);
this.exports = exports; this.exports = exports;
} }
@@ -263,7 +263,7 @@ public class JarScanner implements PluginContentScanner, AutoCloseable {
private abstract static class AbstractAnnotationVisitor extends AnnotationVisitor { private abstract static class AbstractAnnotationVisitor extends AnnotationVisitor {
AbstractAnnotationVisitor() { AbstractAnnotationVisitor() {
super(Opcodes.ASM6); super(Opcodes.ASM7);
} }
@Override @Override