Bug 411915 - [releng] Move to 0.15
diff --git a/cbi/eclipse-parent/pom.xml b/cbi/eclipse-parent/pom.xml
index 7df8dc6..24b3617 100644
--- a/cbi/eclipse-parent/pom.xml
+++ b/cbi/eclipse-parent/pom.xml
@@ -19,18 +19,18 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>0.17.0</tycho.version>
- <tycho-extras.version>0.17.0</tycho-extras.version>
+ <tycho.version>0.18.0</tycho.version>
+ <tycho-extras.version>0.18.0</tycho-extras.version>
- <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-repo.url>
+ <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository</orbit-repo.url>
<jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.3.v20120522/</jetty-repo.url>
- <ecf-repo.url>http://archive.eclipse.org/rt/ecf/3.5.6/site.p2/</ecf-repo.url>
- <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.9milestones/</emf-repo.url>
+ <ecf-repo.url>http://download.eclipse.org/rt/ecf/latest/site.p2/</ecf-repo.url>
+ <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.9/</emf-repo.url>
<aspectj-repo.url>http://download.eclipse.org/tools/ajdt/aspectj/update</aspectj-repo.url>
<egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
<swtbot-repo.url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</swtbot-repo.url>
- <eclipse-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.3milestones</eclipse-updates-repo.url>
+ <eclipse-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.3</eclipse-updates-repo.url>
<kepler-repo.url>http://download.eclipse.org/releases/kepler</kepler-repo.url>
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
<cbi-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-repo.url>
@@ -271,7 +271,7 @@
<baselineReplace>none</baselineReplace>
<baselineRepositories>
<repository>
- <url>http://download.eclipse.org/e4/updates/0.13-I-builds</url>
+ <url>http://download.eclipse.org/e4/updates/0.15-I-builds</url>
</repository>
</baselineRepositories>
</configuration>
diff --git a/org.eclipse.e4.builder/scripts/buildCBI.sh b/org.eclipse.e4.builder/scripts/buildCBI.sh
index 77aac67..573236a 100755
--- a/org.eclipse.e4.builder/scripts/buildCBI.sh
+++ b/org.eclipse.e4.builder/scripts/buildCBI.sh
@@ -17,7 +17,7 @@
gitName="E4 Build"
eclipseStream=4.3
-e4Stream=0.14
+e4Stream=0.15
basebuilderBranch=R3_7
eclipsebuilderBranch=R4_HEAD
@@ -128,7 +128,7 @@
TMP_DIR=$buildDirectory/tmp
export MAVEN_PATH=/opt/public/common/apache-maven-3.0.4/bin
export MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"
-export JAVA_HOME=/opt/public/common/jdk1.7.0_11
+export JAVA_HOME=/opt/public/common/jdk1.7.0_25
export PATH=$JAVA_HOME/bin:${MAVEN_PATH}:$PATH
