diff options
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 /packages/org.eclipse.epp.package.scout.feature | |
parent | 29d56a303e50c57d2782a92742a8e151355f4c67 (diff) | |
download | org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.gz org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.tar.xz org.eclipse.epp.packages-5f4a103d3ceeff57a6135392763123ffa91ef0eb.zip |
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>
Diffstat (limited to 'packages/org.eclipse.epp.package.scout.feature')
4 files changed, 7 insertions, 19 deletions
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> |