Revert "Repack ASM classes in esotericsoftware namespace."

This reverts commit ade0542. shaded jar shall be used instead.
Mr14huashao · Jul 16, 2017 · e023482 · e023482
1 parent ade0542
commit e023482
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 23 deletions.
diff --git a/.classpath b/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="build/junit-4.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-5.1-es.jar"/>
+	<classpathentry kind="lib" path="lib/asm-5.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/jarjar-command-1.0.0-all.jar b/build/jarjar-command-1.0.0-all.jar
diff --git a/build/jarjar.rules b/build/jarjar.rules
diff --git a/lib/asm-5.1-es.jar b/lib/asm-5.1-es.jar
diff --git a/build/asm-5.1.jar → lib/asm-5.1.jar b/build/asm-5.1.jar → lib/asm-5.1.jar
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.esotericsoftware</groupId>
 	<artifactId>reflectasm</artifactId>
-	<version>1.11.6-SNAPSHOT</version>
+	<version>1.11.5-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>ReflectASM</name>
 	<description>High performance Java reflection using code generation</description>

diff --git a/project.yaml b/project.yaml
@@ -1,8 +1,4 @@
-version: 1.11.5
+version: 1.11.4
 ---
-classpath build/jarjar-command-1.0.0-all.jar;
-com.tonicsystems.jarjar.Main.main(new String[] {
-	"-rules", "build/jarjar.rules", "build/asm-5.1.jar", "-output", "lib/asm-5.1-es.jar"
-});
 Build.build(project);
-Build.oneJAR(project);
+Build.oneJAR(project);
diff --git a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java
@@ -14,13 +14,13 @@
 
 package com.esotericsoftware.reflectasm;
 
-import static com.esotericsoftware.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
-import com.esotericsoftware.asm.ClassWriter;
-import com.esotericsoftware.asm.MethodVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
 
 public abstract class ConstructorAccess<T> {
 	boolean isNonStaticMemberClass;

diff --git a/src/com/esotericsoftware/reflectasm/FieldAccess.java b/src/com/esotericsoftware/reflectasm/FieldAccess.java
@@ -14,16 +14,16 @@
 
 package com.esotericsoftware.reflectasm;
 
-import static com.esotericsoftware.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 
-import com.esotericsoftware.asm.ClassWriter;
-import com.esotericsoftware.asm.Label;
-import com.esotericsoftware.asm.MethodVisitor;
-import com.esotericsoftware.asm.Type;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
 
 public abstract class FieldAccess {
 	private String[] fieldNames;

diff --git a/src/com/esotericsoftware/reflectasm/MethodAccess.java b/src/com/esotericsoftware/reflectasm/MethodAccess.java
@@ -14,18 +14,18 @@
 
 package com.esotericsoftware.reflectasm;
 
-import static com.esotericsoftware.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.esotericsoftware.asm.ClassWriter;
-import com.esotericsoftware.asm.Label;
-import com.esotericsoftware.asm.MethodVisitor;
-import com.esotericsoftware.asm.Opcodes;
-import com.esotericsoftware.asm.Type;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 public abstract class MethodAccess {
 	private String[] methodNames;