Configuration change svn -> git as of successful build 2.1M4.
Includes adjustment to change in tagging strategy of jdt bundles.
Note that initial fetching of otdt.map is still a workaround!
diff --git a/releng/build-scripts/build/OT-Compiler/customTargets.xml b/releng/build-scripts/build/OT-Compiler/customTargets.xml
index e3af19d..7a23053 100644
--- a/releng/build-scripts/build/OT-Compiler/customTargets.xml
+++ b/releng/build-scripts/build/OT-Compiler/customTargets.xml
@@ -53,9 +53,8 @@
 	<!-- ===================================================================== -->

 	<target name="getMapFiles">

 		<mkdir dir="${buildDirectory}/maps"/>

-		<property name="svn.map.url" value="${svn.repository.url}/${mapVersionTag}/${pathToMapFile}/${mapFileName}" />

-

-		<svn command="export" url="${svn.map.url}" dest="${buildDirectory}/maps/${mapFileName}" />

+		<echo message="REMEMBER: this is a workaround which requires manual pulling in ${git.repository.path}."/>

+		<copy file="${git.repository.path}/${pathToMapFile}/${mapFileName}" todir="${buildDirectory}/maps/" />

 	</target>

 	

 	<!-- ===================================================================== -->

diff --git a/releng/build-scripts/build/OTDT-Build/customTargets.xml b/releng/build-scripts/build/OTDT-Build/customTargets.xml
index d6314a5..d9676d5 100644
--- a/releng/build-scripts/build/OTDT-Build/customTargets.xml
+++ b/releng/build-scripts/build/OTDT-Build/customTargets.xml
@@ -42,10 +42,10 @@
 		<!-- orig:
 		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
 		-->
-		<property name="svn.map.url" value="${svn.repository.url}/${mapVersionTag}/${pathToMapFile}/${mapFileName}" />
 
 		<mkdir dir="${buildDirectory}/maps"/>
-		<svn command="export" url="${svn.map.url}" dest="${buildDirectory}/maps/${mapFileName}" />
+		<echo message="REMEMBER: this is a workaround which requires manual pulling in ${git.repository.path}."/>
+		<copy file="${git.repository.path}/${pathToMapFile}/${mapFileName}" todir="${buildDirectory}/maps/" />
 	</target>
 
 	<target name="checkLocalMaps">
diff --git a/releng/build-scripts/build/buildVersions.properties b/releng/build-scripts/build/buildVersions.properties
index bb50b6d..51f4d69 100644
--- a/releng/build-scripts/build/buildVersions.properties
+++ b/releng/build-scripts/build/buildVersions.properties
@@ -1,4 +1,4 @@
-#fetchTag=SVN=v20100127
-#fetchTag=SVN=trunk
+#fetchTag=GIT=master
 buildType=I
-buildId=0.7.1
+buildId=2.1.0M4
+
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 45e83a9..da760f2 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -48,11 +48,11 @@
 
 # VERSIONS:
 # Eclipse SKD build identifier:
-EVERSION=I20111025-0808
+EVERSION=I20111209-1447
 # Architecture (as used by OSGi):
 ARCH=`arch`
 # used only locally:
-DROP=${BASEDIR}/drops/I20111025-0808
+DROP=${BASEDIR}/drops/I20111209-1447
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/otdt_runtests.sh b/releng/build-scripts/build/otdt_runtests.sh
index f71ee51..58fc310 100755
--- a/releng/build-scripts/build/otdt_runtests.sh
+++ b/releng/build-scripts/build/otdt_runtests.sh
@@ -55,7 +55,6 @@
 	local cmdLogfiles="-a ${OT_SUITE_LOG}-tail.gz"
 	
 	grep -q "\[java\] BUILD FAILED" "$OT_SUITE_LOG" && { subject="OT Testsuite: Compile/Build Failure!"; }
-	grep -q "svn.*connection timed out" "$OT_SUITE_LOG" && { subject="OT Testsuite: SVN timeout"; message="Nothing to fix, next run hopefully works"; }
 	tail -1000 "$OT_SUITE_LOG" | gzip -f - > "${OT_SUITE_LOG}-tail.gz"
 	echo -e "$message" | mutt -s "$subject" $cmdLogfiles $OT_RECIPIENT
 	cleanup
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 09728c9..ee5c27d 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -15,23 +15,24 @@
 # this one is used by eclipse junit tests:
 vmargs=-Xmx768m -XX:-UseGCOverheadLimit
 
-# SVN repository information:
-svn.repository.url=file://localhost/svnroot/tools/org.eclipse.objectteams/
-mapVersionTag=trunk
+# GIT repository information (FIXME: WORKAROUND):
+git.repository.path=/shared/tools/objectteams/otGitCache/org.eclipse.objectteams/
 pathToMapFile=releng/map
 
 # Version dependent names:
 
 # Details of the Eclipse SDK build upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.8.0.v20110728/scripts
-org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.0.v20111003-1644.jar
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.8.0.v20111116-2011/scripts
+org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.0.v20111107-1631.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.8.0.v20111011-0800
-jdt.feature.version.next=3.8.0.v20111011-0801
+jdt.feature.version=3.8.0.v20111130-1318
+jdt.feature.version.next=3.8.0.v20111130-1319
 
-# SVN & Git Support for PDE BUILD:
+#Git Support for PDE BUILD:
 # (Note: this file must be provided in ${OTScriptDir}/lib)
-svn.pde.build=org.eclipse.team.svn.pde.build_0.7.9.I20110419-1700.jar
-git.pde.build=org.eclipse.egit.fetchfactory_0.12.0.201108111757.jar
+# orig:
+#git.pde.build=org.eclipse.egit.fetchfactory_0.12.0.201108111757.jar
+# enhanced (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365944):
+git.pde.build=org.eclipse.egit.fetchfactory_0.12.0.201112072231.jar
 
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index cde2bdc..049db50 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -182,9 +182,8 @@
 		<untar compression="gzip" src="${eclipse-app.tgz}" dest="${build.root.dir}"/>
 	</target>
 	
-	<target name="AddPluginsToEclipse" description="Add svn.pde.build and git.pde.build plugins to the base Eclipse">
+	<target name="AddPluginsToEclipse" description="Add git.pde.build plugins to the base Eclipse">
 		<mkdir dir="${baseLocation}/dropins/plugins"/>
-		<copy file="${OTScriptDir}/lib/${svn.pde.build}" todir="${baseLocation}/dropins/plugins" />
 		<copy file="${OTScriptDir}/lib/${git.pde.build}" todir="${baseLocation}/dropins/plugins" />
 	</target>
 
@@ -224,7 +223,7 @@
 	            <arg value="-DmapVersionTag=${mapVersionTag}"/>
 	            <arg value="-DpathToMapFile=${pathToMapFile}"/>
 		    	<arg value="-DmapFileName=otdt.map"/>
-		    	<arg value="-Dsvn.repository.url=${svn.repository.url}"/>
+		    	<arg value="-Dgit.repository.path=${git.repository.path}"/>
 	            <arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
 	            <arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
 	            <!--arg value="-verbose" /-->
@@ -300,7 +299,7 @@
 				<arg value="-Dbasearch=${arch}"/>
 				<arg value="-Dtest.root.dir=${test.root.dir}"/>
 				<arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
-				<arg value="-Dsvn.repository.url=${svn.repository.url}"/>
+				<arg value="-Dgit.repository.path=${git.repository.path}"/>
 				<arg value="-DmapVersionTag=${mapVersionTag}"/>
 				<arg value="-DpathToMapFile=${pathToMapFile}"/>
 				<arg value="-DmapFileName=otdt.map"/>
diff --git a/releng/build-scripts/build/test.properties b/releng/build-scripts/build/test.properties
index becbf98..507423e 100644
--- a/releng/build-scripts/build/test.properties
+++ b/releng/build-scripts/build/test.properties
@@ -2,24 +2,24 @@
 
 # pasted output from processSDKmap.sh:
 # ----
-org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.0.v_C17
-org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.0.v20111024-1547
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.8.0.v20111024-1705
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.8.0.v20111024-1705
+org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.1.v20111117-0916
+org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.0.v20111115-2002
+org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.8.0.v20111205-1546
+org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.8.0.v20111115-1507
 org.eclipse.test.performance=org.eclipse.test.performance_3.7.0.v20101027
 # ----
 
 # tests referenced without version qualifier:
-org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.8.0

-org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.8.0

+org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.8.1

+org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.8.1

 
 # this is part of eclipse-test-framework and holds library.xml:
-org.eclipse.test=org.eclipse.test_3.3.100

-

-org.eclipse.objectteams.otdt.tests=org.eclipse.objectteams.otdt.tests_1.3.0

-org.eclipse.objectteams.otdt.ui.tests=org.eclipse.objectteams.otdt.ui.tests_1.3.0

-org.eclipse.objectteams.otdt.ui.tests.dom=org.eclipse.objectteams.otdt.ui.tests.dom_1.3.0

-org.eclipse.objectteams.otdt.debug.tests=org.eclipse.objectteams.otdt.debug.tests_1.3.0

-org.eclipse.objectteams.otdt.ui.tests.refactoring=org.eclipse.objectteams.otdt.ui.tests.refactoring_1.3.0

-org.eclipse.objectteams.otdt.test.builder=org.eclipse.objectteams.otdt.test.builder_1.3.0

-

+org.eclipse.test=org.eclipse.test_3.3.100
+
+org.eclipse.objectteams.otdt.tests=org.eclipse.objectteams.otdt.tests_1.3.0
+org.eclipse.objectteams.otdt.ui.tests=org.eclipse.objectteams.otdt.ui.tests_1.3.0
+org.eclipse.objectteams.otdt.ui.tests.dom=org.eclipse.objectteams.otdt.ui.tests.dom_1.3.0
+org.eclipse.objectteams.otdt.debug.tests=org.eclipse.objectteams.otdt.debug.tests_1.3.0
+org.eclipse.objectteams.otdt.ui.tests.refactoring=org.eclipse.objectteams.otdt.ui.tests.refactoring_1.3.0
+org.eclipse.objectteams.otdt.test.builder=org.eclipse.objectteams.otdt.test.builder_1.3.0
+