Bug 435534 - CBI: Create branch for Scout 4.1.x
https://bugs.eclipse.org/bugs/show_bug.cgi?id=435534
Increment version to 4.1.0 in manifest, pom.xml and feature.xml
diff --git a/org.eclipse.scout-feature/feature.xml b/org.eclipse.scout-feature/feature.xml
index 9e63ec3..cb89128 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="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout"
license-feature="org.eclipse.license"
@@ -26,11 +26,11 @@
</url>
<requires>
- <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"/>
- <import feature="org.eclipse.scout.rt.spec.source" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.source" version="4.1.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.source" version="4.1.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.rap.source" version="4.1.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.testing.source" version="4.1.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.spec.source" version="4.1.0" match="compatible"/>
</requires>
</feature>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index 72e6803..a46d73e 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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 ee03c3b..3ae5870 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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 93e5600..21c19dc 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.scout.parent</artifactId>
@@ -68,7 +68,7 @@
<buildId>${buildType}${maven.build.timestamp}</buildId>
<buildsToKeep>3</buildsToKeep>
- <scout.version>4.0.0-SNAPSHOT</scout.version>
+ <scout.version>4.1.0-SNAPSHOT</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
<tycho.version>0.20.0</tycho.version>
diff --git a/org.eclipse.scout.rap.basic.target/pom.xml b/org.eclipse.scout.rap.basic.target/pom.xml
index a3b245c..428360c 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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 101229a..dbd31f5 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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 c1c1081..9d5978d 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<configuration>
<updatesiteDir>${buildId}</updatesiteDir>
<compositeDir>${stageTargetDir}/scout.main</compositeDir>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index 09263da..fddadd2 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit 09263da3fa6cee9a368321ad986e644746df14d7
+Subproject commit fddadd2d8da9f63161f9b68b60d1a3b975cd70b2
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
index 7c2c462..6c8f76a 160000
--- a/org.eclipse.scout.rt.incubator
+++ b/org.eclipse.scout.rt.incubator
@@ -1 +1 @@
-Subproject commit 7c2c4625e8a46ca955f7a8a810695c0854b5b0aa
+Subproject commit 6c8f76aed92e06c74ca8f964847a1576e85bf121
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.xml b/org.eclipse.scout.rt.rap.target-feature/feature.xml
index 3c55ee8..3b80d98 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="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout.rt.rap.target"
license-feature="org.eclipse.license"
@@ -29,7 +29,7 @@
id="org.eclipse.scout.rt.rap.target"
download-size="0"
install-size="0"
- version="4.0.0.qualifier"
+ version="4.1.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 1f34315..0c0cad2 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.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 6c7a60e..25f9f55 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: 4.0.0.qualifier
+Bundle-Version: 4.1.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 7adf9bd..417c051 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>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 5be45ad..581f319 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 5be45ad2ce5071ccf42100ec0ac2cd3db5c76178
+Subproject commit 581f3192d3f122a5e42a2a1ac0ea9ec2d446d238
diff --git a/pom.xml b/pom.xml
index 2d61173..54ca6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,12 @@
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout-aggregator.git</tycho.scmUrl>
- <scout.base.version>4.0.0</scout.base.version>
+ <scout.base.version>4.1.0</scout.base.version>
</properties>
<distributionManagement>
