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, 8 insertions, 18 deletions

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>