Releng: building against Mars M3
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index eb113a6..ed69c47 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,7 +59,7 @@
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.11.0.v20140806-2000" patch="true"/>
+ <import feature="org.eclipse.jdt" version="3.11.0.v20141029-2000" patch="true"/>
</requires>
<plugin
diff --git a/releng/build-scripts/bin/extractVersions b/releng/build-scripts/bin/extractVersions
index 36adfd6..268fc61 100755
--- a/releng/build-scripts/bin/extractVersions
+++ b/releng/build-scripts/bin/extractVersions
@@ -25,8 +25,8 @@
;;
org.eclipse.jdt*)
JDT_VERSION_ALL=`echo $VERSION|grep jdt | sed -e 's/org.eclipse.jdt_\(.*\)/\1/'`
- JDT_VERSIONA=`echo ${JDT_VERSION_ALL}| sed -e 's/\([0-9]\.[0-9]\.[0-9]\.[^-]*-\)[0-9]\{4\}.*/\1/'`
- JDT_VERSIONB=`echo ${JDT_VERSION_ALL}| sed -e 's/[0-9]\.[0-9]\.[0-9]\.[^-]*-\([0-9]\{4\}\).*/\1/'`
+ JDT_VERSIONA=`echo ${JDT_VERSION_ALL}| sed -e 's/\([0-9]\.[0-9]*\.[0-9]\.[^-]*-\)[0-9]\{4\}.*/\1/'`
+ JDT_VERSIONB=`echo ${JDT_VERSION_ALL}| sed -e 's/[0-9]\.[0-9]*\.[0-9]\.[^-]*-\([0-9]\{4\}\).*/\1/'`
JDT_VERSIONB_NEXT=`expr $JDT_VERSIONB + 1`
;;
org.eclipse.equinox.launcher*)
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 9b163df..a2e279d 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -52,14 +52,14 @@
# VERSIONS:
# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=I20140806-2000
+SDK_QUALIFIER=I20141029-2000
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=4.5M1
-DROP=${BASEDIR}/drops4/S-4.5M1-201408062000
+EVERSION=4.5M3
+DROP=${BASEDIR}/drops4/S-4.5M3-201410292000
# 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/run.properties b/releng/build-scripts/build/run.properties
index eef19c6..6c6d368 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -26,8 +26,8 @@
org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar
# for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.11.0.v20140806-20003.11.0.v20140806-2000
-jdt.feature.version.next=3.11.0.v20140806-2000
+jdt.feature.version=3.11.0.v20141029-2000
+jdt.feature.version.next=3.11.0.v20141029-2001
# -----------------------------------------------------------
#Git Support for PDE BUILD:
