[build] Update target platform for kepler & luna
also update the CompareQuickFix to use latest EMFCompare APIs
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF
index 9b006b1..dbb2d27 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/META-INF/MANIFEST.MF
@@ -23,8 +23,8 @@
com.google.guava;bundle-version="[11.0.0,12.0.0)",
org.eclipse.compare,
org.eclipse.mylyn.docs.intent.modelingunit.update;bundle-version="0.7.0",
- org.eclipse.emf.compare.ide.ui;bundle-version="2.1.0",
- org.eclipse.emf.compare.edit;bundle-version="3.0.0",
+ org.eclipse.emf.compare.ide.ui;bundle-version="3.1.0",
+ org.eclipse.emf.compare.edit;bundle-version="3.1.0",
org.eclipse.ui.forms,
org.eclipse.mylyn.docs.intent.external.parser
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/quickfix/EMFCompareFix.java b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/quickfix/EMFCompareFix.java
index 06a80c4..f01606b 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/quickfix/EMFCompareFix.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/quickfix/EMFCompareFix.java
@@ -19,6 +19,7 @@
import org.eclipse.emf.compare.EMFCompare.Builder;
import org.eclipse.emf.compare.domain.ICompareEditingDomain;
import org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain;
+import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.emf.compare.ide.ui.internal.editor.ComparisonScopeEditorInput;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -91,8 +92,8 @@
Builder builder = EMFCompare.builder();
builder.setMatchEngineFactoryRegistry(EMFCompareUtils.getMatchEngineNeverUsingIdentifiers());
EMFCompare comparator = builder.build();
- CompareEditorInput input = new ComparisonScopeEditorInput(compareConfig, domain, adapterFactory,
- comparator, scope);
+ CompareEditorInput input = new ComparisonScopeEditorInput(new EMFCompareConfiguration(compareConfig),
+ domain, adapterFactory, comparator, scope);
input.setTitle(COMPARE_EDITOR_TITLE + " (" + workingCopyElementURI + ")");
// Step 3: open comparaison dialog
diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler-sdk.target b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler-sdk.target
index 2cedb3f..e71feda 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler-sdk.target
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler-sdk.target
@@ -4,22 +4,21 @@
<target name="Kepler SDK" sequenceNumber="0">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130605-2000"/>
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.8.0.v20130612-0100"/>
-<unit id="org.eclipse.acceleo.feature.group" version="3.4.0.201306101458"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.0.v20130610-0406"/>
+<unit id="org.eclipse.sdk.ide" version="4.3.1.M20130911-1000"/>
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.8.1.v20130917-0100"/>
+<unit id="org.eclipse.acceleo.feature.group" version="3.4.1.201309031307"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.1.v20130902-0605"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.7.0.201306111400"/>
<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
-<unit id="org.eclipse.emf.compare.feature.group" version="2.1.0.201306101322"/>
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.1.0.201306101322"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.9.0.v20130605-2000"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.2.0.v20130613-1556"/>
-<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.9.0.v20130612-0100"/>
+<unit id="org.eclipse.emf.compare.feature.group" version="2.1.1.201309031318"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.1.1.201309031318"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.9.1.v20130911-1000"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.2.1.v20130913-0613"/>
+<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.9.1.v20130917-0100"/>
<repository location="http://download.eclipse.org/releases/kepler"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="11.0.2.v201303041551"/>
-<unit id="com.google.guava.source" version="11.0.2.v201303041551"/>
<unit id="org.junit" version="4.11.0.v201303080030"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
</location>
diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target
index 696a5b3..83bc4e3 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.target
@@ -4,25 +4,21 @@
<target name="Kepler SDK" sequenceNumber="0">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.0.I20130807-2000"/>
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.9.0.20130802-1537"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20130812-1102"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.7.0.201306111400"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
-<unit id="org.eclipse.emf.compare.feature.group" version="2.2.0.201308220902"/>
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.2.0.201308220902"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.10.0.v20130807-2000"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.3.0.v20130814-0914"/>
-<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.10.0.20130809-2135"/>
+<unit id="org.eclipse.sdk.ide" version="4.4.0.I20131212-1600"/>
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.9.0.20131008-0518"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20131216-0403"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.8.0.201312171650"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.8.0.201312171634"/>
+<unit id="org.eclipse.emf.compare.feature.group" version="2.2.0.201312170800"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.2.0.201312170800"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.10.0.v20131212-1600"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.3.0.v20131112-1312"/>
+<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.10.0.20131008-0520"/>
+<unit id="org.eclipse.acceleo.feature.group" version="3.5.0.201312161520"/>
<repository location="http://download.eclipse.org/releases/luna"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="3.4.0.201306101458"/>
-<repository location="http://download.eclipse.org/releases/kepler"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="11.0.2.v201303041551"/>
-<unit id="com.google.guava.source" version="11.0.2.v201303041551"/>
<unit id="org.junit" version="4.11.0.v201303080030"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
</location>
diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform
index ed806fb..098aa42 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/luna-sdk.targetplatform
@@ -13,11 +13,6 @@
org.eclipse.jdt.feature.group
org.eclipse.emf.cdo.sdk.feature.group
org.eclipse.mylyn.ide_feature.feature.group
-}
-
-location "http://download.eclipse.org/releases/kepler" {
- with source, requirements
- // Temporary: waiting for acceleo to contribute to luna
org.eclipse.acceleo.feature.group
}
