From 1c424f3dd58b29f9669bd49934dfee3602ad2269 Mon Sep 17 00:00:00 2001
From: David Krebs <davkrebs@gmail.com>
Date: Thu, 12 Apr 2018 00:02:45 +0200
Subject: [PATCH] shade the bytecode libraries instead of using maven assembly

---
 examples/falo.ini        |  2 +-
 integration_tests/run.sh |  2 +-
 jdcallgraph/pom.xml      | 69 ++++++++++++++++------------------------
 3 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/examples/falo.ini b/examples/falo.ini
index eb737d5..e481b1d 100644
--- a/examples/falo.ini
+++ b/examples/falo.ini
@@ -9,7 +9,7 @@ logConsole: true
 
 format: {class}#{line}
 
-javassist: true
+javassist: false
 
 targets: cg | thread- | entry | single- | dot,
 ddg | single | dot,
diff --git a/integration_tests/run.sh b/integration_tests/run.sh
index c0cd8cc..2ba2406 100755
--- a/integration_tests/run.sh
+++ b/integration_tests/run.sh
@@ -21,7 +21,7 @@ xargs javac -cp target:lib/junit-4.12.jar -d target || exit 255
 function run {
     echo "Run $1 with $2"
     java -cp target:lib/junit-4.12.jar \
-    -javaagent:../jdcallgraph/target/jdcallgraph-0.2-agent.jar=./$2 \
+    -javaagent:../jdcallgraph/target/jdcallgraph-0.2.jar=./$2 \
     com/dkarv/testcases/$1/Main
     if java -cp target com/dkarv/testcases/$1/Verification ; then
         echo "Verification of >>  $1 with $2  << succeeded" >&2
diff --git a/jdcallgraph/pom.xml b/jdcallgraph/pom.xml
index f8f1832..2ab3150 100644
--- a/jdcallgraph/pom.xml
+++ b/jdcallgraph/pom.xml
@@ -23,13 +23,11 @@
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
             <version>1.7.6</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
             <version>3.21.0-GA</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -64,29 +62,41 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>config/assembly.xml</descriptor>
-                    </descriptors>
-                    <archive>
-                        <manifestEntries>
-                            <Can-Redefine-Classes>true</Can-Redefine-Classes>
-                            <Premain-Class>com.dkarv.jdcallgraph.Tracer</Premain-Class>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <relocations>
+                                <relocation>
+                                    <pattern>net.bytebuddy</pattern>
+                                    <shadedPattern>com.dkarv.jdcallgraph.bytebuddy</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javassist</pattern>
+                                    <shadedPattern>com.dkarv.jdcallgraph.javassist</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Premain-Class>com.dkarv.jdcallgraph.Tracer</Premain-Class>
+                            <Can-Retransform-Classes>true</Can-Retransform-Classes>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
@@ -148,31 +158,6 @@
                     </execution>
                 </executions>-->
             </plugin>
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>net.bytebuddy</pattern>
-                                    <shadedPattern>com.dkarv.jdcallgraph.bytebuddy</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
         </plugins>
     </build>
 </project>