summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-08-24 09:04:19 (EDT)
committerpelder2006-08-24 09:04:19 (EDT)
commit4c52a7917a63b1d3240067f02e15a6595e3576fc (patch)
tree2551251cc57c9ccdccaf79c50ce29f788ecf24d4
parent217fbb61f6a05c0890239fe78b3b2b56d0e3b2d4 (diff)
downloadorg.eclipse.jet-4c52a7917a63b1d3240067f02e15a6595e3576fc.zip
org.eclipse.jet-4c52a7917a63b1d3240067f02e15a6595e3576fc.tar.gz
org.eclipse.jet-4c52a7917a63b1d3240067f02e15a6595e3576fc.tar.bz2
[154957] Ensure plug-in dependencies all express a range in MANIFEST.MF and express a minimum version + Compatible in feature.xml
-rw-r--r--doc/org.eclipse.jet.doc-feature/feature.xml4
-rw-r--r--doc/org.eclipse.jet.doc/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.jet.examples-feature/feature.xml2
-rw-r--r--examples/org.eclipse.jet.examples/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.jet-feature/feature.xml30
5 files changed, 23 insertions, 17 deletions
diff --git a/doc/org.eclipse.jet.doc-feature/feature.xml b/doc/org.eclipse.jet.doc-feature/feature.xml
index 982e93a..4b1d27b 100644
--- a/doc/org.eclipse.jet.doc-feature/feature.xml
+++ b/doc/org.eclipse.jet.doc-feature/feature.xml
@@ -21,6 +21,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/technology/emft/updates/"/>
</url>
+ <requires>
+ <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.jet.doc"
download-size="0"
diff --git a/doc/org.eclipse.jet.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.jet.doc/META-INF/MANIFEST.MF
index 8221e21..1805056 100644
--- a/doc/org.eclipse.jet.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.jet.doc/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-SymbolicName: org.eclipse.jet.doc; singleton:=true
Bundle-Version: 0.7.1.qualifier
Bundle-Vendor: %Provider.name
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/examples/org.eclipse.jet.examples-feature/feature.xml b/examples/org.eclipse.jet.examples-feature/feature.xml
index 814b2c7..6559ba8 100644
--- a/examples/org.eclipse.jet.examples-feature/feature.xml
+++ b/examples/org.eclipse.jet.examples-feature/feature.xml
@@ -38,7 +38,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jet"/>
+ <import plugin="org.eclipse.jet" version="0.7.0" match="compatible"/>
</requires>
<plugin
diff --git a/examples/org.eclipse.jet.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.jet.examples/META-INF/MANIFEST.MF
index 424f142..f325c2a 100644
--- a/examples/org.eclipse.jet.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.jet.examples/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Version: 0.7.0.qualifier
Bundle-ClassPath: examples.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jet
+Require-Bundle: org.eclipse.jet;bundle-version="[0.7.0,1.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jet-feature/feature.xml b/plugins/org.eclipse.jet-feature/feature.xml
index cc95a6e..dd54d90 100644
--- a/plugins/org.eclipse.jet-feature/feature.xml
+++ b/plugins/org.eclipse.jet-feature/feature.xml
@@ -22,20 +22,22 @@
</url>
<requires>
- <import plugin="org.eclipse.ant.core"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.emf.codegen"/>
- <import plugin="org.eclipse.emf.common"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.text"/>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.codegen" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
</requires>
<plugin