Updated latest.target and latest.p2f to Mars M7

4 files changed, 19 insertions, 20 deletions

diff --git a/org.eclipse.handly.examples.javamodel.tests/.launch/org.eclipse.handly.examples.javamodel.tests.launch b/org.eclipse.handly.examples.javamodel.tests/.launch/org.eclipse.handly.examples.javamodel.tests.launch
index 345731f1..ed287745 100644
--- a/org.eclipse.handly.examples.javamodel.tests/.launch/org.eclipse.handly.examples.javamodel.tests.launch
+++ b/org.eclipse.handly.examples.javamodel.tests/.launch/org.eclipse.handly.examples.javamodel.tests.launch
@@ -5,7 +5,6 @@
 <booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="automaticAdd" value="true"/>
 <booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="\org.eclipse.handly.examples.basic.ui.tests\.lau"/>
 <stringAttribute key="bootstrap" value=""/>
 <stringAttribute key="checked" value="[NONE]"/>
 <booleanAttribute key="clearConfig" value="true"/>
@@ -30,7 +29,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.handly.examples.javamodel.tests"/>
diff --git a/org.eclipse.handly.examples.javamodel.tests/src/org/eclipse/handly/internal/examples/javamodel/JavaModelListener.java b/org.eclipse.handly.examples.javamodel.tests/src/org/eclipse/handly/internal/examples/javamodel/JavaModelListener.java
index d1baf6db..9cc8e0ed 100644
--- a/org.eclipse.handly.examples.javamodel.tests/src/org/eclipse/handly/internal/examples/javamodel/JavaModelListener.java
+++ b/org.eclipse.handly.examples.javamodel.tests/src/org/eclipse/handly/internal/examples/javamodel/JavaModelListener.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.handly.internal.examples.javamodel;
 
-import static junit.framework.Assert.*;
-
 import org.eclipse.handly.examples.javamodel.IJavaElementDelta;
 import org.eclipse.handly.model.IElementChangeEvent;
 import org.eclipse.handly.model.IElementChangeListener;
 
+import junit.framework.TestCase;
+
 class JavaModelListener
     implements IElementChangeListener
 {
@@ -31,6 +31,6 @@ class JavaModelListener
     {
         String actual =
             (delta == null ? "<null>" : delta.toString().replace("\t", "    "));
-        assertEquals(expected, actual);
+        TestCase.assertEquals(expected, actual);
     }
 }
diff --git a/targets/latest/latest.target b/targets/latest/latest.target
index 60f983fd..4491bb7c 100644
--- a/targets/latest/latest.target
+++ b/targets/latest/latest.target
@@ -10,14 +10,14 @@
        Vladimir Piskarev (1C) - initial API and implementation
 -->
 <?pde version="3.8"?>
-<target name="Latest Platform" sequenceNumber="0">
+<target name="Latest Platform">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/mars/201503271000"/>
+<repository location="http://download.eclipse.org/releases/mars/201505081000"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
diff --git a/tools/latest.p2f b/tools/latest.p2f
index 0345ad51..029edb99 100644
--- a/tools/latest.p2f
+++ b/tools/latest.p2f
@@ -2,67 +2,67 @@
 <?p2f version='1.0.0'?>
 <p2f version='1.0.0'>
   <ius size='13'>
-    <iu id='org.eclipse.sdk.ide' version='4.5.0.I20150320-0800'>
+    <iu id='org.eclipse.sdk.ide' version='4.5.0.I20150430-1445'>
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id='org.eclipse.egit.feature.group' version='4.0.0.201503231230-m1'>
+    <iu id='org.eclipse.egit.feature.group' version='4.0.0.201505050340-m2'>
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id='org.eclipse.m2e.feature.feature.group' version='1.6.0.20150324-2020'>
+    <iu id='org.eclipse.m2e.feature.feature.group' version='1.6.0.20150506-1605'>
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.xtext.sdk.feature.group" version="2.8.1.v201503230617">
+    <iu id="org.eclipse.xtext.sdk.feature.group" version="2.8.3.v201505051043">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.xtend.sdk.feature.group" version="2.8.1.v201503230617">
+    <iu id="org.eclipse.xtend.sdk.feature.group" version="2.8.3.v201505051043">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.xpand.sdk.feature.group" version="2.1.0.v201503240650">
+    <iu id="org.eclipse.xpand.sdk.feature.group" version="2.1.0.v201505051058">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.10.v201503240644">
+    <iu id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.10.v201505050723">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.8.0.v201503240644">
+    <iu id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.8.0.v201505050723">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.8.0.v201503240833">
+    <iu id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.8.0.v201505050939">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150323-0420">
+    <iu id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150504-0831">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.xsd.sdk.feature.group" version="2.10.0.v20150323-0420">
+    <iu id="org.eclipse.xsd.sdk.feature.group" version="2.11.0.v20150504-0831">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.gef.sdk.feature.group" version="3.10.0.201502020307">
+    <iu id="org.eclipse.gef.sdk.feature.group" version="3.10.0.201505040206">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>
     </iu>
-    <iu id="org.eclipse.uml2.sdk.feature.group" version="5.1.0.v20150323-0944">
+    <iu id="org.eclipse.uml2.sdk.feature.group" version="5.1.0.v20150504-0916">
       <repositories size='1'>
         <repository location='http://download.eclipse.org/releases/mars'/>
       </repositories>