From ffcf5cb704149efbb826abcc72903c39ed68ad0b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Mon, 16 Oct 2017 20:47:09 +0200
Subject: [PATCH] [apex] Remove shading for the apex modules - not needed
 anymore

Fixes #605. The apex modules do not contain any non-apex code anymore
(not an uber-jar anymore).

Explicitely defining asm as runtime dependency.
---
 pmd-apex/pom.xml                   | 43 +++++-------------------------
 pmd-dist/pom.xml                   |  6 -----
 pmd-dist/src/main/assembly/bin.xml |  4 ---
 3 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index 5e5394daf1..a504ffc2d2 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -59,43 +59,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>apex</include>
-                </includes>
-                <excludes>
-                  <exclude>${project.groupId}</exclude>
-                </excludes>
-              </artifactSet>
-              <relocations>
-                <!-- apex uses an older version of asm, hence we need to shaded it away -->
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
-                </relocation>
-                <!-- apex uses an older version of jackson, hence we need to shaded it away -->
-                <relocation>
-                  <pattern>com.fasterxml.jackson</pattern>
-                  <shadedPattern>shaded.com.fasterxml.jackson</shadedPattern>
-                </relocation>
-              </relocations>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>apex-jorje-shaded</shadedClassifierName>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -167,6 +130,12 @@
       <artifactId>saxon</artifactId>
     </dependency>
 
+    <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 85d183f441..cd98712317 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -207,12 +207,6 @@
                     <artifactId>pmd-apex</artifactId>
                     <version>${project.version}</version>
                 </dependency>
-                <dependency>
-                    <groupId>net.sourceforge.pmd</groupId>
-                    <artifactId>pmd-apex</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>apex-jorje-shaded</classifier>
-                </dependency>
                 <dependency>
                     <groupId>net.sourceforge.pmd</groupId>
                     <artifactId>pmd-ui</artifactId>
diff --git a/pmd-dist/src/main/assembly/bin.xml b/pmd-dist/src/main/assembly/bin.xml
index 153f25e2b9..2b44241aa9 100644
--- a/pmd-dist/src/main/assembly/bin.xml
+++ b/pmd-dist/src/main/assembly/bin.xml
@@ -52,10 +52,6 @@
             <directoryMode>0755</directoryMode>
             <fileMode>0644</fileMode>
             <useProjectArtifact>false</useProjectArtifact>
-            <!-- exclude the apex (transitive) dependencies - we use the shaded version instead -->
-            <excludes>
-                <exclude>apex:*</exclude>
-            </excludes>
         </dependencySet>
     </dependencySets>
 </assembly>