Skip to content
This repository was archived by the owner on Feb 29, 2024. It is now read-only.

Commit 498801e

Browse files
author
hasaadi
committed
Update ASM version in OSS to 7.0.
This change will affect our Kokoro build artifacts. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=222864022
1 parent cc2965d commit 498801e

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

build/jarjar.jar

1 Byte
Binary file not shown.

src/agent/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ CFLAGS += \
3333
THIRD_PARTY_LIB_PATH ?= /usr/local/lib
3434
THIRD_PARTY_INCLUDE_PATH ?= /usr/local/include
3535
SYSTEM_LIB_PATH ?= /usr/lib/x86_64-linux-gnu
36-
ASM_JAR_PATH ?= /usr/lib/asm-6.0/lib/asm-6.0.jar
37-
ASM_COMMONS_JAR_PATH ?= /usr/lib/asm-6.0/lib/asm-commons-6.0.jar
38-
ASM_UTIL_JAR_PATH ?= /usr/lib/asm-6.0/lib/asm-util-6.0.jar
36+
ASM_JAR_PATH ?= /usr/lib/asm-7.0/lib/asm-7.0.jar
37+
ASM_COMMONS_JAR_PATH ?= /usr/lib/asm-7.0/lib/asm-commons-7.0.jar
38+
ASM_UTIL_JAR_PATH ?= /usr/lib/asm-7.0/lib/asm-util-7.0.jar
3939
GOOGLE_API_JAVA_CLIENT_PATH ?= /usr/lib/google-api-java-client
4040
JARJAR_PATH ?= ../../build/jarjar.jar
4141
JAVA_BUILD ?= maven

src/agent/internals/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
<dependency>
1212
<groupId>org.ow2.asm</groupId>
1313
<artifactId>asm</artifactId>
14-
<version>6.0</version>
14+
<version>7.0</version>
1515
</dependency>
1616
<dependency>
1717
<groupId>org.ow2.asm</groupId>
1818
<artifactId>asm-commons</artifactId>
19-
<version>6.0</version>
19+
<version>7.0</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>org.ow2.asm</groupId>
2323
<artifactId>asm-util</artifactId>
24-
<version>6.0</version>
24+
<version>7.0</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>com.google.api-client</groupId>

src/agent/internals/src/main/java/com/google/devtools/cdbg/debuglets/java/ClassResourcesIndexer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class IndexerClassVisitor extends ClassVisitor {
8484
private String classSignature;
8585

8686
public IndexerClassVisitor(String resourcePath) {
87-
super(Opcodes.ASM6);
87+
super(Opcodes.ASM7);
8888
this.resourcePath = resourcePath;
8989
}
9090

src/agent/internals/src/main/java/com/google/devtools/cdbg/debuglets/java/SourceFileMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class MapperClassVisitor extends ClassVisitor {
8989
private boolean isSyntheticClass;
9090

9191
public MapperClassVisitor() {
92-
super(Opcodes.ASM6);
92+
super(Opcodes.ASM7);
9393
}
9494

9595
@Override
@@ -125,7 +125,7 @@ public MethodVisitor visitMethod(
125125
final String descriptor,
126126
final String signature,
127127
final String[] exceptions) {
128-
return new MethodVisitor(Opcodes.ASM6) {
128+
return new MethodVisitor(Opcodes.ASM7) {
129129
@Override
130130
public void visitMethodInsn(
131131
int opcode,

src/codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<dependency>
1212
<groupId>org.ow2.asm</groupId>
1313
<artifactId>asm</artifactId>
14-
<version>6.0</version>
14+
<version>7.0</version>
1515
</dependency>
1616
<dependency>
1717
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)