commit 006386b85281cc826886a368cbdf61d4c9cb7823
author Thanh Ha <thanh.ha@eclipse.org> Wed Aug 08 16:11:17 2012 -0400
committer Ian Bull <irbull@eclipsesource.com> Thu Sep 13 08:55:53 2012 -0700
tree 5851f6a9787cca58da1f5dcb2a73406ecc11e914
parent 59559f4c9070fd9d3d1c52960b8229ca7f87836d

Fix issue with org.apache.commons.logging pulling in version 1.1 instead of 1.0

features/org.eclipse.equinox.p2.core.feature/pom.xml

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>

features/org.eclipse.equinox.p2.sdk/pom.xml

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>