Upgrade configuration and version numbers for Neon (M0)

- Increment version numbers from 4.5.0 to 4.6.0 - Update strings with versions, using neon-M0 temporarily - Update parent pom.xml - Clean up p2.inf files Change-Id: I9d45fcd400eb4b6dac1226d97d6c5018d149b6dd Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
author: Markus Knauer 2015-07-15 10:33:25 +0000
committer: Markus Knauer 2015-07-15 10:33:25 +0000
commit: 5f4a103d3ceeff57a6135392763123ffa91ef0eb (patch)
tree: 8017276b0a71a83ce76521ec370b04ca9fe4e6dc
parent: 29d56a303e50c57d2782a92742a8e151355f4c67 (diff)
download: org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.gz
org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.xz
org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.zip
116 files changed, 223 insertions, 536 deletions
diff --git a/README.md b/README.md
index 10e62e13..a323c5bb 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,6 @@ desired to build against another release (e.g. a different milestone), or agains
 mirror of this repository. This can be achieved by setting the Java property
 `eclipse.simultaneous.release.repository`to another URL. As an example, by adding the
 following argument to the Maven command line, the EPP build will read its input from the
-composite Eclipse Mars repository:
+composite Eclipse Neon repository:
 
-    -Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/mars"
+    -Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/neon"
diff --git a/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml b/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
index 232d90bf..adbe0e9e 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
@@ -35,9 +35,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-automotive-mars-R-incubation" />
+  <product name="eclipse-automotive-neon-M0-incubation" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.automotive.feature/feature.xml b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
index 8e59a952..8b21d403 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.automotive.feature"
       label="EPP Automotive Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.automotive"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <requires>
diff --git a/packages/org.eclipse.epp.package.automotive.feature/p2.inf b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
index d19b4101..9d6a29d3 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
@@ -6,6 +6,3 @@ requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=org.eclipse.platform.ide
 #requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
 requires.1.greedy=true
-
-
-
diff --git a/packages/org.eclipse.epp.package.automotive.feature/pom.xml b/packages/org.eclipse.epp.package.automotive.feature/pom.xml
index 642871a7..feafe1f8 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.automotive.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.automotive.product/epp.product b/packages/org.eclipse.epp.package.automotive.product/epp.product
index 86d16795..64b4efbc 100644
--- a/packages/org.eclipse.epp.package.automotive.product/epp.product
+++ b/packages/org.eclipse.epp.package.automotive.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Automotive Software Developers" uid="epp.package.automotive" id="org.eclipse.epp.package.automotive.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Automotive Software Developers" uid="epp.package.automotive" id="org.eclipse.epp.package.automotive.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.automotive/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.automotive.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.automotive.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.automotive.product/pom.xml b/packages/org.eclipse.epp.package.automotive.product/pom.xml
index 7bff7e32..9caf233e 100644
--- a/packages/org.eclipse.epp.package.automotive.product/pom.xml
+++ b/packages/org.eclipse.epp.package.automotive.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.automotive</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
index 8b5646d3..3e9f2e31 100644
--- a/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Automotive Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.automotive;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.automotive/pom.xml b/packages/org.eclipse.epp.package.automotive/pom.xml
index 1678834f..4c903425 100644
--- a/packages/org.eclipse.epp.package.automotive/pom.xml
+++ b/packages/org.eclipse.epp.package.automotive/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.automotive</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
index 22f93aa0..3cac5b96 100644
--- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
@@ -9,7 +9,7 @@
        testPlan is the fully qualified URL to the test plan for this package
    -->
   <packageMetaData
-   packageName="Eclipse IDE for Eclipse Committers 4.5.0"
+   packageName="Eclipse IDE for Eclipse Committers 4.6.0 M0"
    maintainer="Eclipse Packaging Project"
    iconurl="http://www.eclipse.org/downloads/images/committers.png"
    bugzillaComponentId="committers-package"
@@ -38,9 +38,9 @@ Click <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
 
   <!-- version, the RCP version to build. This is used to determine the file
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-mars-R" />
+  <product name="eclipse-committers-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.committers.feature/feature.xml b/packages/org.eclipse.epp.package.committers.feature/feature.xml
index 6e55d99d..f987dedb 100644
--- a/packages/org.eclipse.epp.package.committers.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.committers.feature"
       label="EPP Eclipse IDE for Eclipse Committers Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.committers"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.committers.feature/p2.inf b/packages/org.eclipse.epp.package.committers.feature/p2.inf
index f7a855c9..23cb0849 100644
--- a/packages/org.eclipse.epp.package.committers.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.committers.feature/p2.inf
@@ -10,13 +10,3 @@ requires.1.greedy=true
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-
-
diff --git a/packages/org.eclipse.epp.package.committers.feature/pom.xml b/packages/org.eclipse.epp.package.committers.feature/pom.xml
index 5b614bbf..12d24414 100644
--- a/packages/org.eclipse.epp.package.committers.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.committers.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 75936c0f..fde7c3a6 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
@@ -185,7 +185,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.committers.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.committers.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.committers.product/pom.xml b/packages/org.eclipse.epp.package.committers.product/pom.xml
index 0ce296cb..3558ea4c 100644
--- a/packages/org.eclipse.epp.package.committers.product/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.committers</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
index 374f6a64..5f295223 100644
--- a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.epp.package.committers;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/packages/org.eclipse.epp.package.committers/pom.xml b/packages/org.eclipse.epp.package.committers/pom.xml
index bee50907..394a591f 100644
--- a/packages/org.eclipse.epp.package.committers/pom.xml
+++ b/packages/org.eclipse.epp.package.committers/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.committers</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml
index b608e6b2..19ec2621 100644
--- a/packages/org.eclipse.epp.package.common.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.common.feature"
       label="EPP Common Package Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,8 +20,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <requires>
diff --git a/packages/org.eclipse.epp.package.common.feature/p2.inf b/packages/org.eclipse.epp.package.common.feature/p2.inf
index af1b338d..d12a35a2 100644
--- a/packages/org.eclipse.epp.package.common.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.common.feature/p2.inf
@@ -1,14 +1,3 @@
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/mars,name:EPP Packages Repository);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/mars,name:EPP Packages Repository);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/mars);
-
-
-
diff --git a/packages/org.eclipse.epp.package.common.feature/pom.xml b/packages/org.eclipse.epp.package.common.feature/pom.xml
index 29f1efc3..85781d15 100644
--- a/packages/org.eclipse.epp.package.common.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.common.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.common.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
index 626f5283..8e822819 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
@@ -41,9 +41,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-cpp-mars-R" />
+  <product name="eclipse-cpp-neon-M0" />
 
 </configuration>
 \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index b04f3103..e46f15e4 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.cpp.feature"
       label="EPP CPP Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.cpp"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <!-- see p2.inf file for optionally imported Linux Tools features -->
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index 1ec1f3c0..c63dd66d 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -81,4 +81,3 @@ requires.16.optional=true
 requires.17.namespace=org.eclipse.equinox.p2.iu
 requires.17.name=org.eclipse.tracecompass.lttng2.ust.feature.group
 requires.17.optional=true
-
diff --git a/packages/org.eclipse.epp.package.cpp.feature/pom.xml b/packages/org.eclipse.epp.package.cpp.feature/pom.xml
index 49e58781..8cf0912d 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.cpp.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 0ff4aa37..496d7b41 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.cpp/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.cpp.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.cpp.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml
index 2381f740..d6974376 100644
--- a/packages/org.eclipse.epp.package.cpp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.cpp</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
index b6c2564f..4e473905 100644
--- a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP CPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.cpp/pom.xml b/packages/org.eclipse.epp.package.cpp/pom.xml
index 9da6f822..d3c390a9 100644
--- a/packages/org.eclipse.epp.package.cpp/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.cpp</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
index c4d793f7..ea3027b3 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
@@ -28,9 +28,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-mars-R" />
+  <product name="eclipse-dsl-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/feature.xml b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
index 9779d894..6c6879ff 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.dsl.feature"
       label="EPP DSL Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.dsl"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <requires>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/p2.inf b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
index 0035aebb..0cf4783c 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
@@ -5,7 +5,3 @@ org.eclipse.pde.build.append.startlevels=false
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
-
-
-
-
diff --git a/packages/org.eclipse.epp.package.dsl.feature/pom.xml b/packages/org.eclipse.epp.package.dsl.feature/pom.xml
index c404a679..fb0bf8b7 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.dsl.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index 56be6b8e..5e7d7a86 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse DSL Tools" uid="epp.package.dsl" id="org.eclipse.epp.package.dsl.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse DSL Tools" uid="epp.package.dsl" id="org.eclipse.epp.package.dsl.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.dsl/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.dsl.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.dsl.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml
index 2ed5187f..bbdebb21 100644
--- a/packages/org.eclipse.epp.package.dsl.product/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.dsl</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
index c960d6c8..bb5b905f 100644
--- a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP DSL Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.dsl;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.dsl/pom.xml b/packages/org.eclipse.epp.package.dsl/pom.xml
index 9e84f1cc..ff57a4e8 100644
--- a/packages/org.eclipse.epp.package.dsl/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.dsl</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
index 2e44959f..53abdcb2 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -38,9 +38,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-mars-R" />
+	<product name="eclipse-java-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index 4b5e4e4d..9296c64c 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.java.feature"
       label="EPP Java Package"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.java"
       license-feature="org.eclipse.license"
@@ -21,9 +21,9 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
-      <discovery label="Mylyn for Eclipse Mars" url="http://download.eclipse.org/mylyn/releases/mars/"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
+      <discovery label="Mylyn for Eclipse Neon" url="http://download.eclipse.org/mylyn/releases/neon/"/>
    </url>
 
    <requires>
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.feature/p2.inf
index 19d9014a..64a8f664 100644
--- a/packages/org.eclipse.epp.package.java.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.java.feature/p2.inf
@@ -8,13 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars,name:Mylyn for Eclipse Mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars,name:Mylyn for Eclipse Mars);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars);
-
-
-
-
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon);
diff --git a/packages/org.eclipse.epp.package.java.feature/pom.xml b/packages/org.eclipse.epp.package.java.feature/pom.xml
index e717c214..8df0f130 100644
--- a/packages/org.eclipse.epp.package.java.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.java.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.java.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index a5f49b44..a9d51c70 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.java/epp-java-about.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.java.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.java.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml
index ca81ff89..2e4589c5 100644
--- a/packages/org.eclipse.epp.package.java.product/pom.xml
+++ b/packages/org.eclipse.epp.package.java.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.java</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
index 160b51e5..31df3ea7 100644
--- a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Java Package
 Bundle-SymbolicName: org.eclipse.epp.package.java;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.java/pom.xml b/packages/org.eclipse.epp.package.java/pom.xml
index e9438151..97ba6166 100644
--- a/packages/org.eclipse.epp.package.java/pom.xml
+++ b/packages/org.eclipse.epp.package.java/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.java</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
index 8e8c0936..92ed2bbb 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -42,9 +42,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-mars-R" />
+  <product name="eclipse-jee-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.properties b/packages/org.eclipse.epp.package.jee.feature/feature.properties
index 1039205d..08d42781 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.properties
@@ -22,7 +22,7 @@ featureName=EPP Java EE IDE Feature
 providerName=Eclipse Packaging Project
 
 # "updateSiteName" property - label for the update site
-discoverySiteName=Eclipse Mars Release
+discoverySiteName=Eclipse Neon Release
 
 # "description" property - description of the feature
 description=Eclipse Java EE IDE is an all-in-one package for creating web applications. \n\
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index a629ae69..f6a5bacb 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.jee.feature"
       label="%featureName"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.epp.package.jee"
       license-feature="org.eclipse.license"
@@ -21,7 +21,7 @@
    </license>
 
    <url>
-      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/mars/"/>
+      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/neon/"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index b85acde5..303277ba 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -8,16 +8,13 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/mars,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/mars,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars,name:Mylyn for Eclipse Mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars,name:Mylyn for Eclipse Mars);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/neon,name:The Eclipse Web Tools Platform (WTP) software repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon,name:The Eclipse Web Tools Platform (WTP) software repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars);
-
-
-
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon);
diff --git a/packages/org.eclipse.epp.package.jee.feature/pom.xml b/packages/org.eclipse.epp.package.jee.feature/pom.xml
index 423af1b2..94adcecf 100644
--- a/packages/org.eclipse.epp.package.jee.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.jee.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 485438d7..7fdd8ac2 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.jee/aboutgears_115x.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.jee.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.jee.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml
index 61b0c36b..db651537 100644
--- a/packages/org.eclipse.epp.package.jee.product/pom.xml
+++ b/packages/org.eclipse.epp.package.jee.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.jee</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
index b56b665d..37d76363 100644
--- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.epp.package.jee;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.jee/pom.xml b/packages/org.eclipse.epp.package.jee/pom.xml
index 7e20a3fc..30afb0e9 100644
--- a/packages/org.eclipse.epp.package.jee/pom.xml
+++ b/packages/org.eclipse.epp.package.jee/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.jee</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 63968f78..fe3f22a0 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -39,9 +39,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-mars-R" />
+  <product name="eclipse-modeling-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index fa9a4242..5ed0a024 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.modeling.feature"
       label="EPP Modeling Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.modeling"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index 3bbc9ede..a0b3b4a2 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -7,14 +7,10 @@ requires.1.name=org.eclipse.platform.ide
 #requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
 requires.1.greedy=true
 
-
-
-
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/mars/,name:Modeling Package Updates for Eclipse Mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/mars/,name:Modeling Package Updates for Eclipse Mars);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/neon/,name:Modeling Package Updates for Eclipse Neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/neon/,name:Modeling Package Updates for Eclipse Neon);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/mars/);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/mars/);
-
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/neon/);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/neon/);
diff --git a/packages/org.eclipse.epp.package.modeling.feature/pom.xml b/packages/org.eclipse.epp.package.modeling.feature/pom.xml
index 4583de79..4e3e7e6f 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.modeling.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 2fc468b1..063fd085 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.modeling/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.modeling.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.modeling.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml
index ba43b606..93c93624 100644
--- a/packages/org.eclipse.epp.package.modeling.product/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.modeling</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
index ead3199b..89ff32ef 100644
--- a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Modeling Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.modeling;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.modeling/pom.xml b/packages/org.eclipse.epp.package.modeling/pom.xml
index 0568eed6..db772dfc 100644
--- a/packages/org.eclipse.epp.package.modeling/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.modeling</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
index f1d1226e..1312db8e 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
@@ -41,9 +41,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="4.5.0" />
+	<rcp version="4.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-mars-R" />
+	<product name="eclipse-parallel-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/feature.xml b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
index 430c6dd6..b5098847 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.parallel.feature"
       label="EPP Parallel Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.parallel"
       license-feature="org.eclipse.license"
@@ -21,9 +21,9 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
-      <discovery label="PTP" url="http://download.eclipse.org/tools/ptp/updates/mars/"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
+      <discovery label="PTP" url="http://download.eclipse.org/tools/ptp/updates/neon/"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.parallel.feature/p2.inf b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
index bbc151cf..ede092aa 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
@@ -17,15 +17,11 @@ requires.3.namespace=org.eclipse.equinox.p2.iu
 requires.3.name=org.eclipse.photran.xlf.feature.group
 requires.3.optional=true
 
-# Preload ptp update site / repository
+# Preload PTP update site / repository
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/mars,name:PTP);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/mars,name:PTP);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/neon,name:PTP);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/neon,name:PTP);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/mars);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/mars);
-
-
-
-
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/neon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/neon);
diff --git a/packages/org.eclipse.epp.package.parallel.feature/pom.xml b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
index 6e8fc092..3ee74526 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.parallel.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
index f0cd09fe..0713937b 100644
--- a/packages/org.eclipse.epp.package.parallel.product/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Parallel Application Developers" uid="epp.package.parallel" id="org.eclipse.epp.package.parallel.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Parallel Application Developers" uid="epp.package.parallel" id="org.eclipse.epp.package.parallel.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.parallel/eclipse_lg.png"/>
@@ -188,7 +188,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.parallel.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.parallel.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml
index 6bd4f54b..f9cda1c3 100644
--- a/packages/org.eclipse.epp.package.parallel.product/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.parallel</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
index 596a7623..cdcb9d8c 100644
--- a/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Parallel Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.parallel;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.parallel/pom.xml b/packages/org.eclipse.epp.package.parallel/pom.xml
index 63c01812..e316f0f5 100644
--- a/packages/org.eclipse.epp.package.parallel/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.parallel</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
index 5d770cf5..e332f6aa 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
@@ -39,9 +39,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-mars-R" />
+  <product name="eclipse-php-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index 4a9e5a12..5f782bf1 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.php.feature"
       label="EPP PHP Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.php"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.php.feature/p2.inf b/packages/org.eclipse.epp.package.php.feature/p2.inf
index 3adb1b4e..23cb0849 100644
--- a/packages/org.eclipse.epp.package.php.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.php.feature/p2.inf
@@ -10,16 +10,3 @@ requires.1.greedy=true
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-
-
-
-
-
diff --git a/packages/org.eclipse.epp.package.php.feature/pom.xml b/packages/org.eclipse.epp.package.php.feature/pom.xml
index 76ab6e19..1318d763 100644
--- a/packages/org.eclipse.epp.package.php.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.php.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.php.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 0623bdcc..0eff5dfe 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for PHP Developers" uid="epp.package.php" id="org.eclipse.epp.package.php.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for PHP Developers" uid="epp.package.php" id="org.eclipse.epp.package.php.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.php/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.php.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.php.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml
index 0ed99388..17ed2a70 100644
--- a/packages/org.eclipse.epp.package.php.product/pom.xml
+++ b/packages/org.eclipse.epp.package.php.product/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.php</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
index ab16e8bd..cc5d342d 100644
--- a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP PHP Package
 Bundle-SymbolicName: org.eclipse.epp.package.php;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.php/pom.xml b/packages/org.eclipse.epp.package.php/pom.xml
index 87520ddc..bde20736 100644
--- a/packages/org.eclipse.epp.package.php/pom.xml
+++ b/packages/org.eclipse.epp.package.php/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.php</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
index 7b65cdb9..82fa966f 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -41,9 +41,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-mars-R" />
+  <product name="eclipse-rcp-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index dde019e3..63c63ec3 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.rcp.feature"
       label="EPP RCP/RAP Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.rcp"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
 
diff --git a/packages/org.eclipse.epp.package.rcp.feature/p2.inf b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
index 3adb1b4e..23cb0849 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
@@ -10,16 +10,3 @@ requires.1.greedy=true
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-
-
-
-
-
diff --git a/packages/org.eclipse.epp.package.rcp.feature/pom.xml b/packages/org.eclipse.epp.package.rcp.feature/pom.xml
index 0b875793..242fdd08 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.rcp.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 6a31865f..ca997a6d 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.rcp/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.rcp.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.rcp.feature" version="4.6.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature"/>
       <feature id="org.eclipse.help"/>
       <feature id="org.eclipse.jdt"/>
diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml
index 42a3a46d..459b6c3a 100644
--- a/packages/org.eclipse.epp.package.rcp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.rcp</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
index 9325dae0..3a6d711d 100644
--- a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP RCP/RAP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.rcp;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.rcp/pom.xml b/packages/org.eclipse.epp.package.rcp/pom.xml
index 46119e82..6fe9d23c 100644
--- a/packages/org.eclipse.epp.package.rcp/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.rcp</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml b/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
index 1b711118..df25e45c 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
@@ -37,9 +37,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-mars-R" />
+  <product name="eclipse-reporting-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 0c1ffae8..43e81842 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.reporting.feature"
       label="EPP Reporting Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.reporting"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.reporting.feature/p2.inf b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
index d19b4101..9d6a29d3 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
@@ -6,6 +6,3 @@ requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=org.eclipse.platform.ide
 #requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
 requires.1.greedy=true
-
-
-
diff --git a/packages/org.eclipse.epp.package.reporting.feature/pom.xml b/packages/org.eclipse.epp.package.reporting.feature/pom.xml
index d52d873a..059c59bc 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.reporting.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.reporting.product/epp.product b/packages/org.eclipse.epp.package.reporting.product/epp.product
index de9477f1..133a2ff5 100644
--- a/packages/org.eclipse.epp.package.reporting.product/epp.product
+++ b/packages/org.eclipse.epp.package.reporting.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.reporting/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.reporting.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.reporting.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.reporting.product/pom.xml b/packages/org.eclipse.epp.package.reporting.product/pom.xml
index a6e8e454..6c68c888 100644
--- a/packages/org.eclipse.epp.package.reporting.product/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.reporting</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
index 0233c660..8b7c9bda 100644
--- a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Reporting Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.reporting;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.reporting/pom.xml b/packages/org.eclipse.epp.package.reporting/pom.xml
index 971703bc..1311135a 100644
--- a/packages/org.eclipse.epp.package.reporting/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.reporting</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
index b21742a4..121967cd 100644
--- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
@@ -40,9 +40,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-mars-R" />
+  <product name="eclipse-scout-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml
index 24b061cf..c64d5353 100644
--- a/packages/org.eclipse.epp.package.scout.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.scout.feature"
       label="EPP Scout Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.scout"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.scout.feature/p2.inf b/packages/org.eclipse.epp.package.scout.feature/p2.inf
index fe70b978..23cb0849 100644
--- a/packages/org.eclipse.epp.package.scout.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.scout.feature/p2.inf
@@ -10,15 +10,3 @@ requires.1.greedy=true
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-
-
-
-
diff --git a/packages/org.eclipse.epp.package.scout.feature/pom.xml b/packages/org.eclipse.epp.package.scout.feature/pom.xml
index 00f651ad..fa0e7687 100644
--- a/packages/org.eclipse.epp.package.scout.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.scout.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index 0ea5abb1..dafadc44 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Scout Developers" uid="epp.package.scout" id="org.eclipse.epp.package.scout.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Scout Developers" uid="epp.package.scout" id="org.eclipse.epp.package.scout.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.scout/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.scout.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.scout.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml
index 07f38eaa..dd3a4549 100644
--- a/packages/org.eclipse.epp.package.scout.product/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.scout</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
index 962e599e..10055ebd 100644
--- a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Scout Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.scout;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.scout/pom.xml b/packages/org.eclipse.epp.package.scout/pom.xml
index 90526826..f8f1ccda 100644
--- a/packages/org.eclipse.epp.package.scout/pom.xml
+++ b/packages/org.eclipse.epp.package.scout/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.scout</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.testing.feature/epp.website.xml b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
index 183a7d06..d3d1eb82 100644
--- a/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
@@ -39,9 +39,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="4.5.0" />
+  <rcp version="4.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-testing-mars-R" />
+  <product name="eclipse-testing-neon-M0" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.testing.feature/feature.xml b/packages/org.eclipse.epp.package.testing.feature/feature.xml
index e72b0f24..cb0aed38 100644
--- a/packages/org.eclipse.epp.package.testing.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.testing.feature"
       label="EPP Testing Feature"
-      version="4.5.0.qualifier"
+      version="4.6.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.testing"
       license-feature="org.eclipse.license"
@@ -21,8 +21,8 @@
    </license>
 
    <url>
-      <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/>
-      <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
+      <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.testing.feature/p2.inf b/packages/org.eclipse.epp.package.testing.feature/p2.inf
index 6d7f0ad0..2379bc78 100644
--- a/packages/org.eclipse.epp.package.testing.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.testing.feature/p2.inf
@@ -16,17 +16,3 @@ requires.1.greedy=true
 # disable listing of feature in any category
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
-
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/,name:Mylyn for Eclipse Mars);
-
-#instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-
-
-
-
-
-
diff --git a/packages/org.eclipse.epp.package.testing.feature/pom.xml b/packages/org.eclipse.epp.package.testing.feature/pom.xml
index 6b449e80..e68a11ae 100644
--- a/packages/org.eclipse.epp.package.testing.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.testing.feature</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/packages/org.eclipse.epp.package.testing.product/epp.product b/packages/org.eclipse.epp.package.testing.product/epp.product
index 9cac6188..53a100c2 100644
--- a/packages/org.eclipse.epp.package.testing.product/epp.product
+++ b/packages/org.eclipse.epp.package.testing.product/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Testers" uid="epp.package.testing" id="org.eclipse.epp.package.testing.product" application="org.eclipse.ui.ide.workbench" version="4.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Testers" uid="epp.package.testing" id="org.eclipse.epp.package.testing.product" application="org.eclipse.ui.ide.workbench" version="4.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.testing/eclipse_lg.png"/>
@@ -181,7 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.testing.feature" version="4.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.testing.feature" version="4.6.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.testing.product/pom.xml b/packages/org.eclipse.epp.package.testing.product/pom.xml
index 6ee7943a..5101a2d1 100644
--- a/packages/org.eclipse.epp.package.testing.product/pom.xml
+++ b/packages/org.eclipse.epp.package.testing.product/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>epp.package.testing</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
index 27635ca2..9247debc 100644
--- a/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Testing Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.testing;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.testing/pom.xml b/packages/org.eclipse.epp.package.testing/pom.xml
index 11d3ba8a..c0e76132 100644
--- a/packages/org.eclipse.epp.package.testing/pom.xml
+++ b/packages/org.eclipse.epp.package.testing/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp.package.testing</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/pom.xml b/pom.xml
index d7a2a64c..fab67084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-parent</artifactId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>releng/org.eclipse.epp.config/parent/</relativePath>
   </parent>
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp-buildall</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/releng/org.eclipse.epp.config/build.xml b/releng/org.eclipse.epp.config/build.xml
index 99d7359d..fcbe62e9 100644
--- a/releng/org.eclipse.epp.config/build.xml
+++ b/releng/org.eclipse.epp.config/build.xml
@@ -41,7 +41,7 @@
 	            latestversiononly="false"/>
 	        <source>
 	                <sort>
-			            <fileset dir="/tmp/mars">
+			            <fileset dir="/tmp/neon">
     						<include name="*"/>
 						</fileset>
 						<reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
@@ -49,7 +49,7 @@
 						</reverse>
 	                </sort>
 	        </source>
-	        <destination location="${targetRepository}" name="EPP Mars Package Repository" append="true" compressed="true" />
+	        <destination location="${targetRepository}" name="EPP Neon Package Repository" append="true" compressed="true" />
 	    </p2.mirror>
 	</target>
 
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 39fc200a..98e9e761 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -18,7 +18,7 @@
 
   <groupId>org.eclipse.epp</groupId>
   <artifactId>org.eclipse.epp-parent</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -37,11 +37,11 @@
     <!-- The location that is used to assemble the single EPP configuration p2 repository -->
     <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository>
     <!-- ID used to generate the filename of the packages -->
-    <eclipse.simultaneous.release.id>mars-R</eclipse.simultaneous.release.id>
+    <eclipse.simultaneous.release.id>neon-M0</eclipse.simultaneous.release.id>
     <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
     <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
     <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
-    <eclipse.simultaneous.release.name>Mars Release (4.5.0)</eclipse.simultaneous.release.name>
+    <eclipse.simultaneous.release.name>Neon Milestone 0 (4.6.0M0)</eclipse.simultaneous.release.name>
     <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
     <eclipse.simultaneous.release.repository>http://download.eclipse.org/releases/staging/</eclipse.simultaneous.release.repository>
   </properties>
diff --git a/releng/org.eclipse.epp.config/startEPPMars.sh b/releng/org.eclipse.epp.config/startEPPMars.sh
deleted file mode 100755
index 9e847075..00000000
--- a/releng/org.eclipse.epp.config/startEPPMars.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/bin/bash
-#set -x
-umask 0002
-ulimit -n 2048
-
-# Change this if building on build.eclipse.org to "server"; "local" otherwise
-BUILDLOCATION="server"
-
-# Location of the build input
-HTTP_BASE="http://download.eclipse.org"
-FILESYSTEM_BASE="file:///home/data/httpd/download.eclipse.org"
-
-# Define the BASE_URL to be used
-if [ ${BUILDLOCATION} = "server" ]
-then
-   BASE_URL=${FILESYSTEM_BASE}
-   ECLIPSE="/shared/technology/epp/epp_build/mars/eclipse/eclipse"
-   JRE="/usr/local/bin/java"
- else
-   BASE_URL=${HTTP_BASE}
-   ECLIPSE="eclipse"
-   JRE="java"
-fi
-
-###############################################################################
-
-# variables to adjust
-BASE_DIR=/shared/technology/epp/epp_build/mars
-RELEASE_NAME="-mars-R"
-
-# variables
-START_TIME=`date -u +%Y%m%d-%H%M`
-MARKERFILENAME=".epp.nightlybuild"
-STATUSFILENAME="status.stub"
-GITURL="/gitroot/epp/org.eclipse.epp.packages.git"
-GITBRANCH="HEAD"
-GITPROJECTPATH="packages"
-DOWNLOAD_BASE_URL="http://build.eclipse.org/technology/epp/epp_build/mars/download"
-
-# directories and files
-DOWNLOAD_BASE_DIR="${BASE_DIR}/download"
-BUILD_DIR="${BASE_DIR}/build"
-DOWNLOAD_DIR="${DOWNLOAD_BASE_DIR}/${START_TIME}"
-EPPREPO_INPUT_DIR="/shared/technology/epp/epp_repo/mars/epp.build/buildresult/org.eclipse.epp.allpackages.feature_4.5.0-eclipse.feature/site.p2"
-EPPREPO_WORKINGCOPY_DIR="${DOWNLOAD_DIR}/repository"
-MARKERFILE="${DOWNLOAD_DIR}/${MARKERFILENAME}"
-STATUSFILE="${DOWNLOAD_DIR}/${STATUSFILENAME}"
-LOGFILE="${DOWNLOAD_DIR}/build.log"
-LOCKFILE="/tmp/epp.build.mars.lock"
-
-# repository locations
-#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.5.x/"
-#REPO_ECLIPSE_URL="${BASE_URL}/eclipse/updates/4.5milestones/"
-#REPO_SIMRELEASE_URL="${BASE_URL}/releases/mars/"
-REPO_STAGING_URL="${BASE_URL}/releases/staging/"
-#REPO_EPP_URL="${BASE_URL}/technology/epp/packages/mars"
-#REPO_EPP_URL="file://${EPPREPO_INPUT_DIR}"
-REPO_EPP_WORKINGCOPY_URL="file://${EPPREPO_WORKINGCOPY_DIR}"
-
-# repositories used in the build
-METADATAREPOSITORIES="${REPO_STAGING_URL},${REPO_EPP_WORKINGCOPY_URL}"
-ARTIFACTREPOSITORIES="${REPO_STAGING_URL},${REPO_EPP_WORKINGCOPY_URL}"
-
-# definition of OS, WS, ARCH, FORMAT combinations - DO NOT FORGET to adjust the for loop
-OSes=(   win32  win32   linux   linux   macosx  )
-WSes=(   win32  win32   gtk     gtk     cocoa   )
-ARCHes=( x86    x86_64  x86     x86_64  x86_64  )
-FORMAT=( zip    zip     tar.gz  tar.gz  tar.gz  )
-
-###############################################################################
-
-# only one build process allowed
-## using the Hudson EPP lock, but leave the code in there for now
-#if [ -e ${LOCKFILE} ]; then
-#    echo "${START_TIME} EPP build - lockfile ${LOCKFILE} exists" >/dev/stderr
-#    exit 1
-#fi
-#trap "rm -f ${LOCKFILE}; exit" INT TERM EXIT
-#touch ${LOCKFILE}
-
-# create download directory and files, copy p2 repo to working location
-mkdir -p ${DOWNLOAD_DIR}
-touch ${MARKERFILE}
-touch ${STATUSFILE}
-cp -a ${EPPREPO_INPUT_DIR} ${EPPREPO_WORKINGCOPY_DIR}
-NOVA_DIR=${BASE_DIR}/org.eclipse.epp.packages/releng/org.eclipse.epp.config/web
-sed "s/XXXXXXXXXXXXXXXXXXXXXXXXXXXXX/EPP Build ${START_TIME}${RELEASE_NAME}/" ${NOVA_DIR}/novaHeader.html >${DOWNLOAD_DIR}/novaHeader.html
-cp ${NOVA_DIR}/novaFooter.html ${DOWNLOAD_DIR}
-
-# log to file
-exec 2>&1 | tee ${LOGFILE}
-
-# determine which packages to build
-PACKAGES=""
-if [ $# = "0" ]; then
-  # generate the list from the packages checked into CVS
-  echo "CVS CHECKOUT NOT WORKING ANY MORE... THIS PART NEEDS TO BE MIGRATED TO GIT"
-  exit 1
-  cvs -q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/technology checkout -P ${CVSPROJECTPATH}
-  for file in  $(ls ${CVSPROJECTPATH} | grep -v feature | grep -v common | grep -v CVS);  
-  do
-    PACKAGES="${PACKAGES} ${file##org.eclipse.}" 
-  done
-else
-  # take the package names from the command lines if any given
-  PACKAGES="$@"
-fi
-echo "...building the following packages: ${PACKAGES}"
-echo "...using metadata repositories: ${METADATAREPOSITORIES}"
-echo "...using artifact repositories: ${ARTIFACTREPOSITORIES}"
-
-echo "...loading external functions"
-git archive --format=tar --remote=${GITURL} ${GITBRANCH} releng/org.eclipse.epp.config/tools/functions.sh | tar xf - --to-stdout >functions.sh
-. functions.sh
-
-# check-out configuration
-PACKAGES_MAP_FILE=packages_map.txt
-echo "...checking out configuration map to ${PACKAGES_MAP_FILE}"
-git archive --format=tar --remote=${GITURL} ${GITBRANCH} releng/org.eclipse.epp.config/packages_map.txt | tar xf - --to-stdout >${PACKAGES_MAP_FILE}
-pullAllConfigFiles ${PACKAGES_MAP_FILE} ${DOWNLOAD_DIR}
-
-# start statusfile
-echo "<tr>" >>${STATUSFILE}
-echo "<td>${START_TIME}</td>" >>${STATUSFILE}
-
-# build the packages
-for PACKAGE in ${PACKAGES};
-do
-  echo "Building package for IU ${PACKAGE}"
-  mkdir -p ${BUILD_DIR}/${PACKAGE}
-  
-  # Start statusfile
-  echo "<td>"  >>${STATUSFILE}
-
-  for index in 0 1 2 3 4;
-  do
-    echo -n "...EPP building ${PACKAGE} ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]} "
-    EXTENSION="${OSes[$index]}.${WSes[$index]}.${ARCHes[$index]}"
-    PACKAGE_BUILD_DIR="${BUILD_DIR}/${PACKAGE}/${EXTENSION}"
-    rm -rf ${PACKAGE_BUILD_DIR}
-    mkdir -p ${PACKAGE_BUILD_DIR}
-    ${ECLIPSE} -nosplash -consoleLog -application org.eclipse.equinox.p2.director \
-      -m ${METADATAREPOSITORIES} -a ${ARTIFACTREPOSITORIES} \
-      -installIU ${PACKAGE} \
-      -destination ${PACKAGE_BUILD_DIR}/eclipse \
-      -profile ${PACKAGE} \
-      -flavor tooling \
-      -profileproperties org.eclipse.update.install.features=true \
-      -bundlepool ${PACKAGE_BUILD_DIR}/eclipse \
-      -purgeHistory \
-      -p2.os ${OSes[$index]} \
-      -p2.ws ${WSes[$index]} \
-      -p2.arch ${ARCHes[$index]} \
-      -roaming \
-      -vm ${JRE} \
-      -vmargs -Declipse.p2.mirrors=false \
-         2>&1 >${DOWNLOAD_DIR}/${PACKAGE}_${EXTENSION}.log
-    if [ $? = "0" ]; then
-      cd ${PACKAGE_BUILD_DIR}
-      PACKAGE_SHORT=`echo ${PACKAGE} | cut -d "." -f 3`${RELEASE_NAME}
-      if [ ${OSes[$index]} = "win32" ]; then
-        PACKAGEFILE="${START_TIME}_eclipse-${PACKAGE_SHORT}-${EXTENSION}.zip"
-        zip -r -o -q ${DOWNLOAD_DIR}/${PACKAGEFILE} eclipse
-      else
-        PACKAGEFILE="${START_TIME}_eclipse-${PACKAGE_SHORT}-${EXTENSION}.tar.gz"
-        tar zc --owner=100 --group=100 -f ${DOWNLOAD_DIR}/${PACKAGEFILE} eclipse
-      fi
-      cd ..
-      rm -r ${PACKAGE_BUILD_DIR}
-      echo "...successfully finished ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]} package build: ${PACKAGEFILE}"
-      echo ${PACKAGEFILE} >>${DOWNLOAD_DIR}/${PACKAGE}_${EXTENSION}.log
-      echo "<small style=\"background-color: rgb(204, 255, 204);\"><a href=\"${DOWNLOAD_BASE_URL}/${START_TIME}/${PACKAGEFILE}\">${OSes[$index]}.${ARCHes[$index]}</a></small><br>"  >>${STATUSFILE}
-    else
-      echo "...failed while building package ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]}"
-      echo "FAILED" >>${DOWNLOAD_DIR}/${PACKAGE}_${EXTENSION}.log
-      echo "<small style=\"background-color: rgb(255, 204, 204);\"><a href=\"${DOWNLOAD_BASE_URL}/${START_TIME}/${PACKAGE}_${EXTENSION}.log\">${OSes[$index]}.${ARCHes[$index]}</a></small><br>"  >>${STATUSFILE}
-    fi
-  done
-  echo "</td>"  >>${STATUSFILE}
-done
-
-# End statusfile
-echo "</tr>" >>${STATUSFILE}
-
-# remove 'some' (which?) files from the download server
-echo "...remove oldest build from download directory ${DOWNLOAD_BASE_DIR}"
-cd ${DOWNLOAD_BASE_DIR}
-TOBEDELETED_TEMP=`find . -name ${MARKERFILENAME} | grep -v "\./${MARKERFILENAME}" | sort | head -n 1`
-TOBEDELETED_DIR=`echo ${TOBEDELETED_TEMP} | cut -d "/" -f 2`
-echo "......removing ${TOBEDELETED_DIR} from ${DOWNLOAD_BASE_DIR}"
-rm -r ${TOBEDELETED_DIR}
-
-# link results somehow in a single file
-echo "...recreate ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME}"
-rm ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME}
-cd ${DOWNLOAD_BASE_DIR}
-for FILE in `ls -r */${STATUSFILENAME}`
-do
-  echo "......adding $FILE"
-  cat ${FILE} >>${DOWNLOAD_BASE_DIR}/${STATUSFILENAME}
-done
-cp -a --no-preserve=ownership ${DOWNLOAD_BASE_DIR}/${STATUSFILENAME} /home/data/httpd/download.eclipse.org/technology/epp/downloads/testing/statusMars.stub
-
-
-
-###############################################################################
-
-echo "EPP package build finished."
-
-# remove lockfile
-## using the Hudson EPP lock, but leave the code in there for now
-#rm ${LOCKFILE}
-
-## EOF
diff --git a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
index 76c37b0c..b147e8e6 100644
--- a/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
+++ b/releng/org.eclipse.epp.config/tools/addDownloadStats.xsl
@@ -22,7 +22,7 @@ Contributors:
   <xsl:template match="repository/properties">
     <properties size='{@size+1}'>
       <xsl:copy-of select="property" />
-      <property name='p2.statsURI' value='http://download.eclipse.org/stats/technology/epp/packages/mars' />
+      <property name='p2.statsURI' value='http://download.eclipse.org/stats/technology/epp/packages/neon' />
     </properties>
   </xsl:template>
 
diff --git a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
index a84f3bf8..7916d1e3 100755
--- a/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
+++ b/releng/org.eclipse.epp.config/tools/mirrorRepositories.sh
@@ -2,7 +2,7 @@
 
 # directory that points to an Eclipse SDK or similar
 ECLIPSE_DIR="/opt/eclipse/64/eclipse.rcp.kepler.m7"
-#ECLIPSE_DIR="/shared/technology/epp/epp_build/mars/eclipse"
+#ECLIPSE_DIR="/shared/technology/epp/epp_build/neon/eclipse"
 
 ECLIPSE="${ECLIPSE_DIR}/eclipse"
 
diff --git a/releng/org.eclipse.epp.config/tools/releaseRename.sh b/releng/org.eclipse.epp.config/tools/releaseRename.sh
index 01585a2b..02238d2e 100755
--- a/releng/org.eclipse.epp.config/tools/releaseRename.sh
+++ b/releng/org.eclipse.epp.config/tools/releaseRename.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RELEASETRAIN=mars
+RELEASETRAIN=neon
 RELEASEDIRECTORY=/home/data/httpd/download.eclipse.org/technology/epp/downloads/release
 TESTDIRECTORY=/shared/technology/epp/epp_build/${RELEASETRAIN}/download
 CURRENTDIR=${PWD}
author	Markus Knauer	2015-07-15 10:33:25 +0000
committer	Markus Knauer	2015-07-15 10:33:25 +0000
commit	5f4a103d3ceeff57a6135392763123ffa91ef0eb (patch)
tree	8017276b0a71a83ce76521ec370b04ca9fe4e6dc
parent	29d56a303e50c57d2782a92742a8e151355f4c67 (diff)
download	org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.gz org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.xz org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.zip