Skip to content

Commit 22a0a65

Browse files
committed
Fixes #1492 for eclipse plugin, too
1 parent 14d6644 commit 22a0a65

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

ReleaseNotes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Eclipse Update Site: <https://sourceforge.net/projects/pmd/files/pmd-eclipse/upd
66

77
## ????: 4.0.10.v????
88

9+
* Fix classpath errors due to multiple version on asm being on the classpath.
10+
See also [bug #1492](https://sourceforge.net/p/pmd/bugs/1492/).
911

1012
## 25-June-2016: 4.0.9.v20160625-2101
1113

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
2121
Bundle-Vendor: %plugin.provider
2222
Bundle-ClassPath: target/lib/antlr-runtime.jar,
2323
target/lib/antlr4-runtime.jar,
24-
target/lib/apex-jorje-ide.jar,
25-
target/lib/apex-jorje-semantic-tests.jar,
2624
target/lib/asm.jar,
2725
target/lib/commons-io.jar,
2826
target/lib/commons-lang3.jar,
@@ -31,6 +29,7 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
3129
target/lib/jaxen.jar,
3230
target/lib/jcommander.jar,
3331
target/lib/log4j.jar,
32+
target/lib/pmd-apex-apex-jorje-shaded.jar,
3433
target/lib/pmd-apex.jar,
3534
target/lib/pmd-core.jar,
3635
target/lib/pmd-cpp.jar,

net.sourceforge.pmd.eclipse.plugin/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
<stripVersion>true</stripVersion>
3838
<prependGroupId>false</prependGroupId>
3939
<outputDirectory>${project.build.directory}/lib</outputDirectory>
40-
<excludeGroupIds>p2.eclipse-plugin</excludeGroupIds>
40+
<!-- exclude the apex (transitive) dependencies - we use the shaded version instead -->
41+
<excludeGroupIds>p2.eclipse-plugin,apex</excludeGroupIds>
4142
<excludeArtifactIds>net.sourceforge.pmd.eclipse.plugin,net.sourceforge.pmd.eclipse.plugin.source</excludeArtifactIds>
4243
<useRepositoryLayout>false</useRepositoryLayout>
4344
</configuration>

0 commit comments

Comments
 (0)