hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

[apex] Remove shading for the apex modules - not needed anymore

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

Explicitely defining asm as runtime dependency.
This commit is contained in:
Andreas Dangel
2017-10-16 20:47:09 +02:00
parent 4eab602fd3
commit ffcf5cb704
3 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pmd-apex/pom.xml
View File

@ -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>

6
pmd-dist/pom.xml
View File

@ -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>

4
pmd-dist/src/main/assembly/bin.xml
View File

@ -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>