diff options
| author | Markus Alexander Kuppe | 2012-09-12 10:05:08 +0000 |
|---|---|---|
| committer | Markus Alexander Kuppe | 2012-09-12 10:05:08 +0000 |
| commit | fb337480d0c053ce64e84a7cb30b6e43ac0e0bfa (patch) | |
| tree | 739f9fa457a2abe221143aa42eea0308532fea6e | |
| parent | 6b95f1014751dc8418c8ffb722cfab468a5fd00c (diff) | |
| download | org.eclipse.ecf-fb337480d0c053ce64e84a7cb30b6e43ac0e0bfa.tar.gz org.eclipse.ecf-fb337480d0c053ce64e84a7cb30b6e43ac0e0bfa.tar.xz org.eclipse.ecf-fb337480d0c053ce64e84a7cb30b6e43ac0e0bfa.zip | |
Either reference dependecies in the cspex _or_ in the feature.xml. The
feature overwrites/hides the cspex entries.
Move dependency to feature.xml as it is supposed to be packaged into the
p2 repository.
| -rw-r--r-- | releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex | 5 | ||||
| -rw-r--r-- | releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex index d20a37e35..287d17acf 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex @@ -6,11 +6,6 @@ <dependencies> <dependency name="org.eclipse.platform" componentType="eclipse.feature"/> <dependency name="org.eclipse.equinox.concurrent" componentType="osgi.bundle"/> - <!-- Explicitly reflect the import-package dependency as defined by --> - <!-- org.apache.httpcomponents.httpclient 4.1.2, because Buckminster --> - <!-- does not handle import-package definitions and thus needs a little --> - <!-- help figuring out what bundle to select --> - <dependency name="org.apache.commons.logging" versionDesignator="1.1.1" componentType="osgi.bundle"/> <!-- Add filetransfer tests --> <dependency name="org.eclipse.ecf.tests.filetransfer.feature" componentType="eclipse.feature"/> </dependencies> diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml index db315a2a0..7a97b3d78 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml @@ -52,11 +52,11 @@ Contributors: Composent, Inc. - initial API and implementation fragment="true" unpack="false"/> - <plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
+ <plugin + id="org.apache.commons.logging" + download-size="0" + install-size="0" + version="1.1.1" + unpack="false"/> + </feature> |