diff options
| author | Thanh Ha | 2012-08-08 20:11:17 +0000 |
|---|---|---|
| committer | Ian Bull | 2012-09-13 15:55:53 +0000 |
| commit | 006386b85281cc826886a368cbdf61d4c9cb7823 (patch) | |
| tree | 5851f6a9787cca58da1f5dcb2a73406ecc11e914 | |
| parent | 59559f4c9070fd9d3d1c52960b8229ca7f87836d (diff) | |
| download | rt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.tar.gz rt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.tar.xz rt.equinox.p2-006386b85281cc826886a368cbdf61d4c9cb7823.zip | |
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.xml | 16 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.p2.sdk/pom.xml | 25 |
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 a4feeebae..06e10e7bf 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 848b9fdd2..d81b56744 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> |