diff options
| author | Eike Stepper | 2012-11-14 08:43:41 +0000 |
|---|---|---|
| committer | Eike Stepper | 2012-11-14 08:43:41 +0000 |
| commit | 3f14b971c405d5e6658650240becca8073dff577 (patch) | |
| tree | b087b7be1accb230832da9aca0c4acb6c0635040 /plugins | |
| parent | cdc97f961b5ebfdb2693658f66c60eccb362b09a (diff) | |
| download | cdo-3f14b971c405d5e6658650240becca8073dff577.tar.gz cdo-3f14b971c405d5e6658650240becca8073dff577.tar.xz cdo-3f14b971c405d5e6658650240becca8073dff577.zip | |
Upgrade to EMF Compare 3.0
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.releng/build.rmap | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF index 84aa1750df..889ba9c08f 100644 --- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.emf.cdo.internal.compare.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.emf.compare;bundle-version="[2.0.0,3.0.0)";visibility:=reexport + org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport Export-Package: org.eclipse.emf.cdo.compare;version="4.2.0", org.eclipse.emf.cdo.internal.compare.bundle;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap index 67d48da411..2708d2fa41 100644 --- a/plugins/org.eclipse.emf.cdo.releng/build.rmap +++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap @@ -60,7 +60,7 @@ <!-- EMF Compare --> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/interim/2.0/I201210011706"/> + <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/milestones/2.1"/> </rm:provider> <!-- MWE --> diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF index 8b7b26d988..e6dd184f15 100644 --- a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.compare;bundle-version="[4.2.0,5.0.0)";visibility:=reexport, - org.eclipse.emf.compare.ide.ui;bundle-version="[2.0.0,3.0.0)" + org.eclipse.emf.compare.ide.ui;bundle-version="[3.0.0,4.0.0)" Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.2.0", org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.2.0";x-internal:=true |