Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-07-01 14:26:16 -0400
committerDavid Williams2015-07-01 14:26:16 -0400
commit764f2d3d74fadd0ead4b648bf23987108522fb08 (patch)
tree74ffea73c72b0e9ae1d35c128651b2a1a00b16aa
parent0719a7f265f99e011a6d4280b507c092a645b31e (diff)
downloadeclipse.platform.releng.aggregator-764f2d3d74fadd0ead4b648bf23987108522fb08.tar.gz
eclipse.platform.releng.aggregator-764f2d3d74fadd0ead4b648bf23987108522fb08.tar.xz
eclipse.platform.releng.aggregator-764f2d3d74fadd0ead4b648bf23987108522fb08.zip
Bug 469765 - Prep for 4.6 (Neon) and 4.5 (Mars) maintenance builds
-rwxr-xr-xbootstrap/mb4I.sh2
-rwxr-xr-xbootstrap/mb4N.sh2
-rwxr-xr-xbootstrap/mb4X.sh2
-rw-r--r--eclipse-platform-parent/pom.xml12
-rw-r--r--eclipse.platform.releng.prereqs.sdk/pom.xml2
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product2
-rw-r--r--pom.xml2
-rw-r--r--production/build_eclipse_org.shsource2
-rw-r--r--production/downloadsites/eclipse/downloads/dlconfig4.php8
-rwxr-xr-xproduction/sdk/cleaners/dailyClean.sh2
-rwxr-xr-xproduction/sdk/cleaners/weeklyClean.sh2
-rw-r--r--production/sdk/declareTemplate/declare.txt4
-rw-r--r--production/testScripts/configuration/streamSpecific.properties2
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh2
-rw-r--r--scripts/createdeltapack.xml2
35 files changed, 56 insertions, 56 deletions
diff --git a/bootstrap/mb4I.sh b/bootstrap/mb4I.sh
index 885e89ae..8a550b15 100755
--- a/bootstrap/mb4I.sh
+++ b/bootstrap/mb4I.sh
@@ -79,7 +79,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NA
export BRANCH=master
export BUILD_TYPE=I
-export STREAM=4.5.0
+export STREAM=4.6.0
eclipseStreamMajor=${STREAM:0:1}
diff --git a/bootstrap/mb4N.sh b/bootstrap/mb4N.sh
index 893a1fa6..8a651b7e 100755
--- a/bootstrap/mb4N.sh
+++ b/bootstrap/mb4N.sh
@@ -78,7 +78,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NA
export BRANCH=master
export BUILD_TYPE=N
-export STREAM=4.5.0
+export STREAM=4.6.0
eclipseStreamMajor=${STREAM:0:1}
diff --git a/bootstrap/mb4X.sh b/bootstrap/mb4X.sh
index 26f0cd4a..9c5b188b 100755
--- a/bootstrap/mb4X.sh
+++ b/bootstrap/mb4X.sh
@@ -78,7 +78,7 @@ echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NA
export BRANCH=david_williams/macapp
export BUILD_TYPE=X
-export STREAM=4.5.0
+export STREAM=4.6.0
eclipseStreamMajor=${STREAM:0:1}
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 839843b5..734694b5 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -45,7 +45,7 @@
such as Version: 4.4.0 (Luna), for main features.
See bug 328139.
-->
- <releaseName>Mars</releaseName>
+ <releaseName>Neon</releaseName>
<!--
The releaseNumbers below, for SDK and Platform, might be
thought of as the "marketing number" or "branding number",
@@ -60,8 +60,8 @@
but we'd still want the "marketing number" to be increased to reflect
"a new yearly release".
-->
- <releaseNumberSDK>4.5</releaseNumberSDK>
- <releaseNumberPlatform>4.5</releaseNumberPlatform>
+ <releaseNumberSDK>4.6</releaseNumberSDK>
+ <releaseNumberPlatform>4.6</releaseNumberPlatform>
<!-- using snapshot, or locally built (forked) snapshot version for bug 461207 and bug 431116
<tycho.version>0.23.0-SNAPSHOT</tycho.version>
@@ -81,7 +81,7 @@
-->
<eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5/R-4.5-201506032000</eclipserun-repo>
- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.5-I-builds</comparator.repo>
+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.6-I-builds</comparator.repo>
<!--
NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
@@ -137,7 +137,7 @@
Usually set to N-builds for main dev. cycle, but set to I-builds during RC time (since there are
no N-builds, but daily I-builds).
-->
- <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.5-I-builds</eclipse-p2-repo.url>
+ <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.6-N-builds</eclipse-p2-repo.url>
<!--
If configuration is not specified at all, in signing plugin, the default
@@ -256,7 +256,7 @@
<artifact>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-sdk-prereqs</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</artifact>
</target>
<environments>
diff --git a/eclipse.platform.releng.prereqs.sdk/pom.xml b/eclipse.platform.releng.prereqs.sdk/pom.xml
index 6b643ea6..c524b668 100644
--- a/eclipse.platform.releng.prereqs.sdk/pom.xml
+++ b/eclipse.platform.releng.prereqs.sdk/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.eclipse</groupId>
<artifactId>eclipse-sdk-prereqs</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
<name>eclipse-sdk-prereqs</name>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
index b2fb7d00..1b868a8c 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="false">
<license>
<url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index 56f3591d..f12e0fc3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -22,7 +22,7 @@
</parent>
<groupId>eclipse.platform.repository</groupId>
<artifactId>eclipse.platform.repository</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
<plugins>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
index ee645e29..c1797864 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list.txt
@@ -1,4 +1,4 @@
-# List of approved API changes after 4.5 M6
+# List of approved API changes after 4.6 M6
# The unapproved entry exclude list can be copied from <build>/buildlogs/mb080_publish-eclipse_output.txt
# Search for: Potential exclude list:
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
index 52275e12..02731764 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product uid="org.eclipse.equinox.sdk.product" useFeatures="true" includeLaunchers="false" version="4.5.0.qualifier">
+<product uid="org.eclipse.equinox.sdk.product" useFeatures="true" includeLaunchers="false" version="4.6.0.qualifier">
<license>
<url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
index e84e4d29..dca81336 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>equinox-sdk</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<!--
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
index f5c0e08e..72e97bf1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 100625f2..324fd2fe 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.eclipse.rt.osgistarterkit.product</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index ad9666c8..519691b2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial Mars Release of the Platform SDK.
+properties.1.value = Initial Neon Release of the Platform SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
index 121a448a..fc427afa 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index a8a32d01..923f49fa 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.eclipse.platform.sdk</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<properties>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index 70c32fb8..4dedf0f0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.platform.configuration.macosx
@@ -51,7 +51,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial Mars Release of the Eclipse Platform.
+properties.1.value = Initial Neon Release of the Eclipse Platform.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
index af847a66..dc8068c0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 8073ebff..c2d4f428 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -30,7 +30,7 @@
This value shows up, for example, in the splash screen. See bug 423677.
-->
<artifactId>org.eclipse.platform.ide</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<properties>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
index 02f7a7ac..fbc4aaee 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -25,7 +25,7 @@
<groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
<artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
index 29705a3d..297175a9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.eclipse.rcp.sdk.id</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
index 6ed9086b..00674280 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
index 98b1abb2..043f339f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.eclipse.rcp.id</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
index b3864ff4..6446837f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index 5e5e7b76..cc43e147 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -29,7 +29,7 @@
This value shows up, for example, in the splash screen. See bug 423677.
-->
<artifactId>org.eclipse.sdk.ide</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<properties>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index e28a73d1..0943c182 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -1,8 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.5,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Mars);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.6,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/mars,name:Neon);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial Mars Release of the Eclipse SDK.
+properties.1.value = Initial Neon Release of the Eclipse SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
index 1b20599f..36abe79e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/pom.xml b/pom.xml
index 43ad22a0..29fd17ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>platform-aggregator</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 538a4253..26bfc539 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -8,7 +8,7 @@ source localBuildProperties.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.5.0}
+export STREAM=${STREAM:-4.6.0}
export BUILD_TYPE=${BUILD_TYPE:-N}
# If not set be caller, make sure its an empty string
diff --git a/production/downloadsites/eclipse/downloads/dlconfig4.php b/production/downloadsites/eclipse/downloads/dlconfig4.php
index ddd06b9d..62c54ace 100644
--- a/production/downloadsites/eclipse/downloads/dlconfig4.php
+++ b/production/downloadsites/eclipse/downloads/dlconfig4.php
@@ -8,10 +8,10 @@ $dropPrefix[]="N";
$dropPrefix[]="P";
$dropType = array();
$dropType[]="Latest Release";
-$dropType[]="4.5 Stable Builds";
-$dropType[]="4.5 Integration Builds";
-$dropType[]="4.4 Maintenance Builds";
-$dropType[]="4.5 Nightly Builds";
+$dropType[]="4.6 Stable Builds";
+$dropType[]="4.6 Integration Builds";
+$dropType[]="4.5 Maintenance Builds";
+$dropType[]="4.6 Nightly Builds";
$dropType[]="Patch Builds";
// the "prefix" array and dropType array must be of same size, defined in right order
for ($i = 0; $i < count($dropType); $i++) {
diff --git a/production/sdk/cleaners/dailyClean.sh b/production/sdk/cleaners/dailyClean.sh
index 20326692..8bb74b01 100755
--- a/production/sdk/cleaners/dailyClean.sh
+++ b/production/sdk/cleaners/dailyClean.sh
@@ -49,7 +49,7 @@ echo -e "nOldBuilds: $nOldBuilds"
#find /shared/eclipse/eclipse4N/siteDir/eclipse/downloads/drops4 -maxdepth 1 -ctime +1 -name "N*" -ls -exec rm -fr '{}' \;
find /shared/eclipse/builds/4N/siteDir/eclipse/downloads/drops4 -maxdepth 1 -ctime +1 -name "N*" -ls -exec rm -fr '{}' \;
find /shared/eclipse/builds/4N/siteDir/equinox/drops -maxdepth 1 -ctime +1 -name "N*" -ls -exec rm -fr '{}' \;
-find /shared/eclipse/builds/4N/siteDir/updates/4.5-N-builds -maxdepth 1 -ctime +1 -name "N*" -ls -exec rm -fr '{}' \;
+find /shared/eclipse/builds/4N/siteDir/updates/4.6-N-builds -maxdepth 1 -ctime +1 -name "N*" -ls -exec rm -fr '{}' \;
#
# promotion scripts
find /shared/eclipse/sdk/promotion/queue -name "RAN*" -ctime +2 -ls -exec rm '{}' \;
diff --git a/production/sdk/cleaners/weeklyClean.sh b/production/sdk/cleaners/weeklyClean.sh
index 4faad72f..63b4dfa1 100755
--- a/production/sdk/cleaners/weeklyClean.sh
+++ b/production/sdk/cleaners/weeklyClean.sh
@@ -14,7 +14,7 @@ find /shared/eclipse/builds/4I/siteDir/eclipse/downloads/drops4 -maxdepth 1 -cti
find /shared/eclipse/builds/4I/siteDir/equinox/drops -maxdepth 1 -ctime +2 -name "I*" -ls -exec rm -fr '{}' \;
-find /shared/eclipse/builds/4I/siteDir/updates/4.5-I-builds -maxdepth 1 -ctime +2 -name "I*" -ls -exec rm -fr '{}' \;
+find /shared/eclipse/builds/4I/siteDir/updates/4.6-I-builds -maxdepth 1 -ctime +2 -name "I*" -ls -exec rm -fr '{}' \;
# don't really need these yet, until after Kepler
find /shared/eclipse/builds/4M/siteDir/eclipse/downloads/drops4 -maxdepth 1 -ctime +2 -name "M*" -ls -exec rm -fr '{}' \;
diff --git a/production/sdk/declareTemplate/declare.txt b/production/sdk/declareTemplate/declare.txt
index a43d4e33..fac9484b 100644
--- a/production/sdk/declareTemplate/declare.txt
+++ b/production/sdk/declareTemplate/declare.txt
@@ -8,10 +8,10 @@ Eclipse downloads
http://download.eclipse.org/eclipse/downloads/drops4/I20150318-2000/
Software repository:
-http://download.eclipse.org/eclipse/updates/4.5-I-builds/
+http://download.eclipse.org/eclipse/updates/4.6-I-builds/
or non-composite repository:
- http://download.eclipse.org/eclipse/updates/4.5-I-builds/I20150318-2000/
+ http://download.eclipse.org/eclipse/updates/4.6-I-builds/I20150318-2000/
Equinox downloads:
http://download.eclipse.org/equinox/drops/I20150318-2000/
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 4b26eba2..10efa069 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,7 +5,7 @@
# purely title or identifier for display, to help confirm right file
# is being retrived and used.
-streamSpecificPropertiesTitle="Properties for 4.5.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.6.0 builds and tests"
# These "previousRelease" variables are primarily used to have a
# stable version of Eclipse, that is used, for example, for it's p2
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 7541e8c3..e0b7d66e 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -86,7 +86,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose http://${GIT_HOST}/c/platfor
ANTFILE=getEBuilder.xml
buildId=I20150320-0800
-eclipseStream=4.5.0
+eclipseStream=4.6.0
EBUILDER_HASH=master
#EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a
diff --git a/scripts/createdeltapack.xml b/scripts/createdeltapack.xml
index 0120f738..893ae866 100644
--- a/scripts/createdeltapack.xml
+++ b/scripts/createdeltapack.xml
@@ -43,7 +43,7 @@
<property
name="buildRepo"
- value="http://download.eclipse.org/eclipse/updates/4.5/" />
+ value="http://download.eclipse.org/eclipse/updates/4.6/" />
<property
name="projectDir"
value="${basedir}" />

Back to the top