summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-31 11:10:40 (EDT)
committerEike Stepper2007-08-31 11:10:40 (EDT)
commitefd3d0deea8d3c1335f3ed096a0768a4d05ebd4e (patch)
tree10fb3367dae1bac7720f0683b8c1e53b63b8d1dc
parentb6e3f3ab12b2978556460f29d666daacde12ce79 (diff)
downloadcdo-efd3d0deea8d3c1335f3ed096a0768a4d05ebd4e.zip
cdo-efd3d0deea8d3c1335f3ed096a0768a4d05ebd4e.tar.gz
cdo-efd3d0deea8d3c1335f3ed096a0768a4d05ebd4e.tar.bz2
[201839] Net4j/CDO Components must comform to incubation rules
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201839
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF4
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/.classpath b/plugins/org.eclipse.emf.cdo.server.db/.classpath
index 9124412..30038b3 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/.classpath
+++ b/plugins/org.eclipse.emf.cdo.server.db/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/eclipse/emf/cdo/server/internal/db/CDODBStoreManager.java|org/eclipse/emf/cdo/server/internal/db/CDODBTransaction.java" kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 8c5796c..9ece956 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.8.0.qualifier
Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.net4j;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
+ org.eclipse.net4j;bundle-version="[0.8.0,0.9.0)";visibility:=reexport
Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
Export-Package: org.eclipse.net4j.internal.jvm;version="0.8.0",
org.eclipse.net4j.jvm;version="0.8.0"
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index 114aee0..7b0549a 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.net4j.tests.bundle.Activator
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.junit;visibility:=reexport,
- org.eclipse.net4j.tcp;visibility:=reexport
+ org.eclipse.net4j.tcp;bundle-version="[0.8.0,0.9.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.tests,
org.eclipse.net4j.tests.signal,
org.eclipse.net4j.util.tests
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index f1b75da..6e85633 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.internal.net4j.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.net4j.util;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
+ org.eclipse.net4j.util;bundle-version="[0.8.0,0.9.0)";visibility:=reexport
Export-Package: org.eclipse.internal.net4j;version="0.8.0",
org.eclipse.net4j;version="0.8.0",
org.eclipse.net4j.signal;version="0.8.0",