summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-08-08 16:11:17 (EDT)
committer Ian Bull2012-09-13 11:55:53 (EDT)
commit006386b85281cc826886a368cbdf61d4c9cb7823 (patch)
tree5851f6a9787cca58da1f5dcb2a73406ecc11e914
parent59559f4c9070fd9d3d1c52960b8229ca7f87836d (diff)
downloadrt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.zip
rt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.tar.gz
rt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.tar.bz2
Fix issue with org.apache.commons.logging pulling in version 1.1 instead of 1.0v20120913-155553
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/pom.xml16
-rw-r--r--features/org.eclipse.equinox.p2.sdk/pom.xml25
2 files changed, 40 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.p2.core.feature/pom.xml b/features/org.eclipse.equinox.p2.core.feature/pom.xml
index a4feeeb..06e10e7 100644
--- a/features/org.eclipse.equinox.p2.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/pom.xml
@@ -25,10 +25,24 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <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>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<executions>
diff --git a/features/org.eclipse.equinox.p2.sdk/pom.xml b/features/org.eclipse.equinox.p2.sdk/pom.xml
index 848b9fd..d81b567 100644
--- a/features/org.eclipse.equinox.p2.sdk/pom.xml
+++ b/features/org.eclipse.equinox.p2.sdk/pom.xml
@@ -23,4 +23,29 @@
<artifactId>org.eclipse.equinox.p2.sdk</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+ <versionRange>[1.0,1.1)</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging.source</id>
+ <versionRange>[1.0,1.1)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>