Merge pull request #1 from joschi/maven-shade

Remove repackaged ASM source files and use maven-shade-plugin instead

Author: CodingFabian

Readme.md

@@ -48,7 +48,3 @@ Connect to the JVM with any JMX client and use the `de.codecentric.Agent` MBean
 
 ## Where are the freaking tests?
 Glad that you asked. Please take a look at the source files and then come up with a sensible unit test. If you manage to do that feel free to put up a PR.
-
-## Info on ASM
-This agent uses ASM (http://asm.ow2.org/) for bytecode manipulation. It contains a repackaged asm 5.0.3 implementation in the `de.codecentric.performance.asm` package. Besides the package move it is the original ASM code and all of their copyrights apply.
-It has been repackaged to avoid conflicts with possible other ASM versions on the classpath.

pom.xml

@@ -2,6 +2,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
+	<prerequisites>
+		<maven>3.0.0</maven>
+	</prerequisites>
+
 	<groupId>de.codecentric.performance</groupId>
 	<artifactId>allocation-tracker-agent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -39,9 +43,38 @@
 					<downloadJavadocs>true</downloadJavadocs>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>2.3</version>
+				<executions>
+					<execution>
+					        <phase>package</phase>
+					        <goals>
+					            <goal>shade</goal>
+					        </goals>
+					        <configuration>
+							<relocations>
+								<relocation>
+									<pattern>org.objectweb.asm</pattern>
+									<shadedPattern>de.codecentric.performance.agent.asm.org.objectweb.asm</shadedPattern>
+								</relocation>
+							</relocations>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>5.0.3</version>
+		</dependency>
+	</dependencies>
+
 	<profiles>
 		<profile>
 			<id>java-6</id>

src/main/java/de/codecentric/performance/agent/allocation/AllocationTrackerClassFileTransformer.java

@@ -4,11 +4,11 @@
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 
-import de.codecentric.performance.agent.asm.org.objectweb.asm.ClassReader;
-import de.codecentric.performance.agent.asm.org.objectweb.asm.ClassVisitor;
-import de.codecentric.performance.agent.asm.org.objectweb.asm.ClassWriter;
-import de.codecentric.performance.agent.asm.org.objectweb.asm.MethodVisitor;
-import de.codecentric.performance.agent.asm.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 
 /**
  * ClassFileTransformer implementation which will use ASM to visit the bytecode of constructors of classes matching the

src/main/java/de/codecentric/performance/agent/allocation/ConstructorVisitor.java

@@ -1,7 +1,7 @@
 package de.codecentric.performance.agent.allocation;
 
-import de.codecentric.performance.agent.asm.org.objectweb.asm.MethodVisitor;
-import de.codecentric.performance.agent.asm.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 
 /**
  * Changes the bytecode of the visited constructor to call the static tracker. technically could be added to any method.