From 41f8df607c4478afea373f68beb4d42d629c94c9 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 15 Aug 2012 15:54:48 +0200
Subject: Adjust releng files for Kepler

---
 .../CDO AllTests (Dawn Core).launch                        |  2 +-
 .../CDO AllTests (Dawn UI).launch                          |  2 +-
 .../META-INF/MANIFEST.MF                                   |  2 +-
 plugins/org.eclipse.emf.cdo.releng/buckminster.cspex       | 14 --------------
 plugins/org.eclipse.emf.cdo.releng/build.rmap              |  6 +++---
 .../CDO AllTests (MEMDB4O).launch                          |  4 ++--
 .../launches/CDO AllTests (MEM branching SSL).launch       |  2 +-
 plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF       |  2 +-
 .../org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch   |  4 ++--
 9 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn Core).launch b/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn Core).launch
index 4adfcd682e..5250c25527 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn Core).launch	
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn Core).launch	
@@ -9,7 +9,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.dawn.tests.AllTestsDawn"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.dawn.tests"/>
 </launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn UI).launch b/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn UI).launch
index a78c3b68ee..710c0ba1f3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn UI).launch	
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/CDO AllTests (Dawn UI).launch	
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.dawn.tests.AllTestsDawnUI"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.dawn.tests"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
index f8162a95cd..76fcd9feba 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.teneo.hibernate.mapper;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.teneo.annotations;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.cdo.server.hibernate;bundle-version="[4.0.0,5.0.0)",
- org.junit;bundle-version="[4.0.0,5.0.0)"
+ org.junit;bundle-version="[3.0.0,4.0.0)"
 Import-Package: org.hibernate;version="[4.0.0,5.0.0)",
  org.hibernate.cfg;version="[4.0.0,5.0.0)",
  org.hibernate.engine;version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
index 30a47eeaad..5c2cdb5bf1 100644
--- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
+++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex
@@ -7,35 +7,21 @@
 
 		<cs:dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.platform" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.platform.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.jdt" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.jdt.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.pde" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.pde.source" componentType="eclipse.feature"/>
 
-		<cs:dependency name="org.eclipse.emf.base" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.base.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.ocl" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.ocl.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.transaction" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.transaction.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.workspace" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.workspace.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.teneo.hibernate" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.teneo.hibernate.source" componentType="eclipse.feature"/>
 
 		<cs:dependency name="org.eclipse.zest" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.zest.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.gef" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.gef.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.gmf" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.gmf.source" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.mwe.core" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.mwe2.runtime.sdk" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.emf.ecoretools" componentType="eclipse.feature"/>
-		<cs:dependency name="org.eclipse.emf.ecoretools.source" componentType="eclipse.feature"/>
 
 		<cs:dependency name="org.eclipse.swtbot" componentType="eclipse.feature"/>
 		<cs:dependency name="org.eclipse.swtbot.eclipse" componentType="eclipse.feature"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 9dfe1c5754..4409f37126 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -5,7 +5,7 @@
 	<!-- Properties -->
 
 	<rm:property key="platform.version" mutable="true" value="3.8"/>
-	<rm:property key="emf.version" mutable="true" value="2.8"/>
+	<rm:property key="emf.version" mutable="true" value="2.9-I-builds"/>
 	<rm:property key="orbit.version" mutable="true" value="S20120726065500"/>
 
 	<rm:property key="git.clone" mutable="true" value="${user.home}/git/cdo"/>
@@ -45,7 +45,7 @@
 		<!-- PLATFORM -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
 			resolutionFilter="(resolve.target.platform=true)">
-			<rm:uri format="{0}/eclipse/updates/{1}milestones">
+			<rm:uri format="{0}/eclipse/updates/{1}">
 				<bc:propertyRef key="eclipse.downloads"/>
 				<bc:propertyRef key="platform.version"/>
 			</rm:uri>
@@ -54,7 +54,7 @@
 		<!-- EMF -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
 			resolutionFilter="(resolve.target.platform=true)">
-			<rm:uri format="{0}/modeling/emf/emf/updates/{1}milestones">
+			<rm:uri format="{0}/modeling/emf/emf/updates/{1}">
 				<bc:propertyRef key="eclipse.downloads"/>
 				<bc:propertyRef key="emf.version"/>
 			</rm:uri>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch
index f215d2deeb..41319ae274 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch	
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch	
@@ -9,8 +9,8 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db4o.AllTestsDB4OMem"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db4o"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m&#10;-Xmx1024m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m&#13;&#10;-Xmx1024m"/>
 </launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (MEM branching SSL).launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (MEM branching SSL).launch
index 639b882a66..240799ca81 100644
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (MEM branching SSL).launch	
+++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (MEM branching SSL).launch	
@@ -15,7 +15,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllTestsMEMBranchesSSL"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c -Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.tests}/sslKey/testTrust  -Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.tests}/sslKey/testKeys -Xmx1024m"/>
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index d3ea2b6a36..04fc922a1b 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibili
  org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
+ org.junit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.net4j.tests;version="4.1.100",
  org.eclipse.net4j.tests.apps;version="4.1.100",
  org.eclipse.net4j.tests.bugzilla;version="4.1.100",
diff --git a/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch b/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch
index f2f7de7c90..d6cb4c0cb8 100644
--- a/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch	
+++ b/plugins/org.eclipse.net4j.tests/Net4j AllTests (OSGi).launch	
@@ -32,8 +32,8 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.util@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.junit@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui@default:default,org.eclipse.help@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.jface@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j@default:default,org.eclipse.net4j.tests@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common*2.8.0.v20120530-0726@default:default,org.eclipse.emf.common*2.8.0.v20120606-0717@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.tests@default:default,org.eclipse.net4j@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
-- 
cgit v1.2.3