Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 525586 - Feature versions should be updated to 17.0
  • Loading branch information
@mrennie
mrennie committed Oct 4, 2017
1 parent 8d875c2 commit 3760d5e
Show file tree
Hide file tree
Showing 27 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion features/org.eclipse.orion-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.core"
license-feature="org.eclipse.license"
Expand Down
8 changes: 4 additions & 4 deletions features/org.eclipse.orion-feature/p2.inf
View file
@@ -1,15 +1,15 @@
requires.1.namespace = org.eclipse.equinox.p2.iu
requires.1.name = org.eclipse.orion.client.feature.feature.group
requires.1.range = [16.0.0, 17.0.0)
requires.1.range = [17.0.0, 18.0.0)

requires.1.namespace = org.eclipse.equinox.p2.iu
requires.1.name = org.eclipse.orion.server.feature.feature.group
requires.1.range = [16.0.0, 17.0.0)
requires.1.range = [17.0.0, 18.0.0)

requires.1.namespace = org.eclipse.equinox.p2.iu
requires.1.name = org.eclipse.orion.server.authentication.feature.feature.group
requires.1.range = [16.0.0, 17.0.0)
requires.1.range = [17.0.0, 18.0.0)

requires.1.namespace = org.eclipse.equinox.p2.iu
requires.1.name = org.eclipse.orion.server.search.feature.feature.group
requires.1.range = [16.0.0, 17.0.0)
requires.1.range = [17.0.0, 18.0.0)
2 changes: 1 addition & 1 deletion features/org.eclipse.orion-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.base-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.base.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.core"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.base-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.base.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.releng.test.master-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.releng.test.master"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.tests"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.releng.test.master-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.releng.test.master</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.core"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.authentication-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.authentication.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.authentication"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.authentication-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.authentication.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.hosting-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.hosting.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.hosting-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.hosting.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.jetty-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.jetty.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.jetty-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.jetty.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.search-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.search.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.search"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.search-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.search.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.tests-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.tests.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.tests"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.tests-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.tests.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.ui-feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.ui.feature"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.core"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.ui-feature/pom.xml
View file
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.orion.feature</groupId>
<artifactId>org.eclipse.orion.server.ui.feature</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.orion.server.war/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.orion.server.war"
label="%featureName"
version="16.0.0.qualifier"
version="17.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.orion.server.core"
license-feature="org.eclipse.license"
Expand Down
16 changes: 8 additions & 8 deletions features/org.eclipse.orion.server.war/war.product
View file
Expand Up @@ -25,14 +25,14 @@
</plugins>

<features>
<feature id="org.eclipse.orion.client.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.authentication.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.base.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.hosting.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.jetty.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.search.feature" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.war" version="16.0.0.qualifier"/>
<feature id="org.eclipse.orion.client.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.authentication.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.base.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.hosting.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.jetty.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.search.feature" version="17.0.0.qualifier"/>
<feature id="org.eclipse.orion.server.war" version="17.0.0.qualifier"/>
</features>

<configurations>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -64,7 +64,7 @@
<java-version>1.6</java-version>
<orion-repository>https://repo.eclipse.org/content/repositories/orion/</orion-repository>
<antrun-version>1.7</antrun-version>
<build-version>16.0.0-v${maven.build.timestamp}</build-version>
<build-version>17.0.0-v${maven.build.timestamp}</build-version>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
</properties>

Expand Down
18 changes: 9 additions & 9 deletions releng/org.eclipse.orion.server.repository/category.xml
View file
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eclipse.orion_16.0.0.qualifier.jar" id="org.eclipse.orion" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion_17.0.0.qualifier.jar" id="org.eclipse.orion" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.base.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.base.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.base.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.base.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.client.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.client.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.client.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.client.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.releng.test.master_16.0.0.qualifier.jar" id="org.eclipse.orion.releng.test.master" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.releng.test.master_17.0.0.qualifier.jar" id="org.eclipse.orion.releng.test.master" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.server.authentication.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.server.authentication.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.server.authentication.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.server.authentication.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.server.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.server.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.server.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.server.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.server.search.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.server.search.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.server.search.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.server.search.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.server.tests.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.server.tests.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.server.tests.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.server.tests.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<feature url="features/org.eclipse.orion.server.ui.feature_16.0.0.qualifier.jar" id="org.eclipse.orion.server.ui.feature" version="16.0.0.qualifier">
<feature url="features/org.eclipse.orion.server.ui.feature_17.0.0.qualifier.jar" id="org.eclipse.orion.server.ui.feature" version="17.0.0.qualifier">
<category name="org.eclipse.orion.server"/>
</feature>
<category-def name="org.eclipse.orion.server" label="Orion Server"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.orion.server.repository/orion.product
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse Orion" uid="org.eclipse.orion" id="org.eclipse.orion.product" application="org.eclipse.orion.application" version="16.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Eclipse Orion" uid="org.eclipse.orion" id="org.eclipse.orion.product" application="org.eclipse.orion.application" version="17.0.0.qualifier" useFeatures="true" includeLaunchers="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.orion.server.repository/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@

<groupId>org.eclipse.orion</groupId>
<artifactId>org.eclipse.orion.server.repository</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<parent>
Expand Down

0 comments on commit 3760d5e

Please sign in to comment.