Bug 412011 - CBI Build: Add Eclipse Luna Integration to target file
https://bugs.eclipse.org/bugs/show_bug.cgi?id=412011
Increment pom, manifest and feature.xml to version 4.0.0
Change-Id: If9784f634593a5fb642a67f45aaf8e621f526960
Reviewed-on: https://git.eclipse.org/r/21804
Reviewed-by: Ken Lee <kle@bsiag.com>
IP-Clean: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>
diff --git a/org.eclipse.scout-feature/feature.xml b/org.eclipse.scout-feature/feature.xml
index d5804b4..40e5ba2 100644
--- a/org.eclipse.scout-feature/feature.xml
+++ b/org.eclipse.scout-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout"
label="%featureName"
- version="3.10.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout">
@@ -24,10 +24,10 @@
</url>
<requires>
- <import feature="org.eclipse.scout.rt.source" version="3.10.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.source" version="3.10.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.rap.source" version="3.10.0" match="compatible"/>
- <import feature="org.eclipse.scout.rt.testing.source" version="3.10.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.source" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.source" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.rap.source" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.testing.source" version="4.0.0" match="compatible"/>
</requires>
</feature>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index dff975e..72e6803 100644
--- a/org.eclipse.scout-feature/pom.xml
+++ b/org.eclipse.scout-feature/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.maven.plugins.updatesite/pom.xml b/org.eclipse.scout.maven.plugins.updatesite/pom.xml
index 28da317..ee03c3b 100644
--- a/org.eclipse.scout.maven.plugins.updatesite/pom.xml
+++ b/org.eclipse.scout.maven.plugins.updatesite/pom.xml
@@ -15,7 +15,7 @@
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<dependencies>
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index a24e936..82d2ff7 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.scout.parent</artifactId>
@@ -63,12 +63,12 @@
<properties>
<buildType>N</buildType>
- <stageTargetDir>nightly/3.10</stageTargetDir>
+ <stageTargetDir>nightly/4.0</stageTargetDir>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<buildId>${buildType}${maven.build.timestamp}</buildId>
<buildsToKeep>3</buildsToKeep>
- <scout.base.version>3.10.0</scout.base.version>
+ <scout.base.version>4.0.0</scout.base.version>
<scout.version>${scout.base.version}-SNAPSHOT</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
diff --git a/org.eclipse.scout.rap.basic.target/pom.xml b/org.eclipse.scout.rap.basic.target/pom.xml
index a7a00ca..a3b245c 100644
--- a/org.eclipse.scout.rap.basic.target/pom.xml
+++ b/org.eclipse.scout.rap.basic.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rap.repository/pom.xml b/org.eclipse.scout.rap.repository/pom.xml
index f431622..101229a 100644
--- a/org.eclipse.scout.rap.repository/pom.xml
+++ b/org.eclipse.scout.rap.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -185,7 +185,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>stage</id>
diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index cb08689..c1c1081 100644
--- a/org.eclipse.scout.repository/pom.xml
+++ b/org.eclipse.scout.repository/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<configuration>
<updatesiteDir>${buildId}</updatesiteDir>
<compositeDir>${stageTargetDir}/scout.main</compositeDir>
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.xml b/org.eclipse.scout.rt.rap.target-feature/feature.xml
index e55ff8d..9f4305f 100644
--- a/org.eclipse.scout.rt.rap.target-feature/feature.xml
+++ b/org.eclipse.scout.rt.rap.target-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout.rt.rap.target"
label="%featureName"
- version="3.10.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout.rt.rap.target">
@@ -27,7 +27,7 @@
id="org.eclipse.scout.rt.rap.target"
download-size="0"
install-size="0"
- version="3.10.0.qualifier"
+ version="4.0.0.qualifier"
unpack="false"/>
</feature>
diff --git a/org.eclipse.scout.rt.rap.target-feature/pom.xml b/org.eclipse.scout.rt.rap.target-feature/pom.xml
index fc2de79..1f34315 100644
--- a/org.eclipse.scout.rt.rap.target-feature/pom.xml
+++ b/org.eclipse.scout.rt.rap.target-feature/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
index 1c90b2a..6c7a60e 100644
--- a/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scout RAP Target
Bundle-SymbolicName: org.eclipse.scout.rt.rap.target
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: Eclipse Scout Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.scout.rt.rap.target/pom.xml b/org.eclipse.scout.rt.rap.target/pom.xml
index 919e3c5..7adf9bd 100644
--- a/org.eclipse.scout.rt.rap.target/pom.xml
+++ b/org.eclipse.scout.rt.rap.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index e446969..d8ca334 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>