diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly index 470cbfad..dc470374 100644 --- a/eclipse/src/plugin-resources/templates/classpath.jelly +++ b/eclipse/src/plugin-resources/templates/classpath.jelly @@ -149,7 +149,8 @@ - + + diff --git a/eclipse/src/plugin-test/maven.xml b/eclipse/src/plugin-test/maven.xml index fc91cf35..db129216 100644 --- a/eclipse/src/plugin-test/maven.xml +++ b/eclipse/src/plugin-test/maven.xml @@ -38,7 +38,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -123,8 +123,10 @@ - - + + + + diff --git a/eclipse/src/plugin-test/project.properties b/eclipse/src/plugin-test/project.properties index 901a2a6f..ae3b577a 100644 --- a/eclipse/src/plugin-test/project.properties +++ b/eclipse/src/plugin-test/project.properties @@ -1 +1,3 @@ -cactus.src.dir=. \ No newline at end of file +cactus.src.dir=. +maven.jar.override=on +maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar \ No newline at end of file diff --git a/eclipse/src/plugin-test/project.xml b/eclipse/src/plugin-test/project.xml index cfacc088..12f97b2b 100644 --- a/eclipse/src/plugin-test/project.xml +++ b/eclipse/src/plugin-test/project.xml @@ -53,6 +53,13 @@ + + facts + commons-dude + 1.0.3 + jar + + maven beta-8 diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml index f4036cca..6107c2b9 100644 --- a/eclipse/xdocs/changes.xml +++ b/eclipse/xdocs/changes.xml @@ -25,7 +25,7 @@ - Jar overrides are not supported. Unit test to verify fix + Jar overrides are now properly supported. Fixed a 'race condition' where Cactus dependency is added twice to .classpath.