summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-08-08 16:06:12 (EDT)
committer Paul Webster2012-09-12 10:49:17 (EDT)
commit6b05db279c61d73412128bd3a500469edeafb684 (patch)
treea6df67f5041e9807fbfb8790c417d905dff980e8
parent7248f4602797388effabac51a1a43b22e9d7d274 (diff)
downloadeclipse.platform.releng-6b05db279c61d73412128bd3a500469edeafb684.zip
eclipse.platform.releng-6b05db279c61d73412128bd3a500469edeafb684.tar.gz
eclipse.platform.releng-6b05db279c61d73412128bd3a500469edeafb684.tar.bz2
Fix issue with org.apache.commons.logging pulling in version 1.1 instead of 1.0
-rw-r--r--features/master-equinox/pom.xml9
-rw-r--r--features/org.eclipse.help-feature/pom.xml5
2 files changed, 14 insertions, 0 deletions
diff --git a/features/master-equinox/pom.xml b/features/master-equinox/pom.xml
index c6a459f..4e1aa84 100644
--- a/features/master-equinox/pom.xml
+++ b/features/master-equinox/pom.xml
@@ -34,6 +34,15 @@
<artifactId>target-platform-configuration</artifactId>
<configuration>
<executionEnvironment>J2SE-1.5</executionEnvironment>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+ <versionRange>[1.0,1.1)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
<plugin>
diff --git a/features/org.eclipse.help-feature/pom.xml b/features/org.eclipse.help-feature/pom.xml
index 04950e4..31ca0fc 100644
--- a/features/org.eclipse.help-feature/pom.xml
+++ b/features/org.eclipse.help-feature/pom.xml
@@ -45,6 +45,11 @@
<id>org.apache.lucene.analysis</id>
<versionRange>[2.9,3.0)</versionRange>
</requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+ <versionRange>[1.0,1.1)</versionRange>
+ </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>