root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Reduce usages of repackaged ASM 5 (#5525) 

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
This commit is contained in:
Basil Crow 2021-05-29 06:46:05 -07:00 committed by GitHub
parent 120587635d
commit 1149dbcf19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bom/pom.xml
View File

@ -40,7 +40,7 @@ THE SOFTWARE.
<properties>
<slf4jVersion>1.7.30</slf4jVersion>
<stapler.version>1532.vfcf95addcb5f</stapler.version>
<stapler.version>1539.v2f05ce93882d</stapler.version>
<groovy.version>2.4.12</groovy.version>
</properties>
@ -193,6 +193,11 @@ THE SOFTWARE.
<artifactId>jnr-posix</artifactId>
<version>3.1.6</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.1</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>windows-package-checker</artifactId>

14
core/pom.xml
View File

@ -107,6 +107,20 @@ THE SOFTWARE.
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<!--
For compatibility only; not included into the BOM for the same reason. TODO once
https://github.com/jenkinsci/scm-api-plugin/pull/88 is widely adopted, this
dependency can be dropped.
-->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>asm5</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>

17
core/src/main/java/hudson/util/SubClassGenerator.java
View File

@ -25,23 +25,24 @@ package hudson.util;
import hudson.PluginManager.UberClassLoader;
import jenkins.model.Jenkins;
import org.kohsuke.asm5.ClassWriter;
import org.kohsuke.asm5.MethodVisitor;
import org.kohsuke.asm5.Type;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Type;
import java.lang.reflect.Constructor;
import static org.kohsuke.asm5.Opcodes.ACC_PUBLIC;
import static org.kohsuke.asm5.Opcodes.ALOAD;
import static org.kohsuke.asm5.Opcodes.ILOAD;
import static org.kohsuke.asm5.Opcodes.INVOKESPECIAL;
import static org.kohsuke.asm5.Opcodes.RETURN;
import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
import static org.objectweb.asm.Opcodes.ALOAD;
import static org.objectweb.asm.Opcodes.ILOAD;
import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
import static org.objectweb.asm.Opcodes.RETURN;
/**
* Generates a new class that just defines constructors into the super types.
*
* @author Kohsuke Kawaguchi
*/
@Deprecated
public class SubClassGenerator extends ClassLoader {
public SubClassGenerator(ClassLoader parent) {
super(parent);