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>

4 files changed, 12 insertions, 16 deletions

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>