Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Sacchi2015-04-27 04:10:56 -0400
committerAdrian Sacchi2015-04-27 04:10:56 -0400
commit5b73b809195770d7169933c027153a8987575396 (patch)
tree330d573ad20c80e1873cbfe92bf394dc156bc0ac
parentfc9d592b10fdc52312bb0cdbb492c34c46b11357 (diff)
downloadorg.eclipse.scout-aggregator-5b73b809195770d7169933c027153a8987575396.tar.gz
org.eclipse.scout-aggregator-5b73b809195770d7169933c027153a8987575396.tar.xz
org.eclipse.scout-aggregator-5b73b809195770d7169933c027153a8987575396.zip
bug 441610: Release- and Build-Management for MarsPRE_BRANCH_5_0
https://bugs.eclipse.org/bugs/show_bug.cgi?id=441610 update version 4.3.0 --> 5.0.0
-rw-r--r--org.eclipse.scout-feature/feature.xml12
-rw-r--r--org.eclipse.scout-feature/pom.xml2
-rw-r--r--org.eclipse.scout.maven.plugins.updatesite/pom.xml2
-rwxr-xr-xorg.eclipse.scout.parent/pom.xml6
-rw-r--r--org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target4
-rw-r--r--org.eclipse.scout.rap.basic.target/pom.xml2
-rw-r--r--org.eclipse.scout.rap.repository/pom.xml4
-rw-r--r--org.eclipse.scout.repo.all.target/org.eclipse.scout.repo.all.target_template.target6
-rw-r--r--org.eclipse.scout.repo.all.target/pom.xml2
-rw-r--r--org.eclipse.scout.repository/pom.xml4
m---------org.eclipse.scout.rt0
m---------org.eclipse.scout.rt.incubator0
-rw-r--r--org.eclipse.scout.rt.rap.target-feature/feature.xml4
-rw-r--r--org.eclipse.scout.rt.rap.target-feature/pom.xml2
-rw-r--r--org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.scout.rt.rap.target/pom.xml2
m---------org.eclipse.scout.sdk0
-rw-r--r--pom.xml4
18 files changed, 29 insertions, 29 deletions
diff --git a/org.eclipse.scout-feature/feature.xml b/org.eclipse.scout-feature/feature.xml
index 12990ab..5eb6171 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.3.0.qualifier"
+ version="5.0.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.3.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.source" version="4.3.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.rap.source" version="4.3.0" match="compatible"/>
- <import feature="org.eclipse.scout.rt.testing.source" version="4.3.0" match="compatible"/>
- <import feature="org.eclipse.scout.rt.spec.source" version="4.3.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.source" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.source" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.rap.source" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.testing.source" version="5.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.spec.source" version="5.0.0" match="compatible"/>
</requires>
</feature>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index a0491e6..44f73a3 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.3.0-SNAPSHOT</version>
+ <version>5.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 f020a16..04a24a2 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.3.0-SNAPSHOT</version>
+ <version>5.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 04305c9..91eeed8 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.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.scout.parent</artifactId>
@@ -63,12 +63,12 @@
<properties>
<buildType>N</buildType>
- <stageTargetDir>nightly/4.3</stageTargetDir>
+ <stageTargetDir>nightly/5.0</stageTargetDir>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<buildId>${buildType}${maven.build.timestamp}</buildId>
<buildsToKeep>3</buildsToKeep>
- <scout.version>4.3.0-SNAPSHOT</scout.version>
+ <scout.version>5.0.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/org.eclipse.scout.rap.basic.target_template.target b/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
index b3a1532..511653a 100644
--- a/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
+++ b/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
@@ -3,13 +3,13 @@
<target name="scout-rap-basic-target.target">
<locations>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="scout_nightly_4.3" location="http://download.eclipse.org/scout/nightly/4.3"/>
+ <repository id="scout_nightly_4.3" location="http://download.eclipse.org/scout/nightly/5.0"/>
<unit id="org.eclipse.scout.rt.rap.basic.target.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="jar:$SCOUT_RT_RAP_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-4.3.0-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_RT_RAP_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-5.0.0-SNAPSHOT.zip!/"/>
<unit id="org.eclipse.scout.rt.rap.source.feature.group" version="0.0.0"/>
</location>
diff --git a/org.eclipse.scout.rap.basic.target/pom.xml b/org.eclipse.scout.rap.basic.target/pom.xml
index 0501c02..3af349b 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.3.0-SNAPSHOT</version>
+ <version>5.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 d45cdf2..433d2ee 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.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -156,7 +156,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>stage</id>
diff --git a/org.eclipse.scout.repo.all.target/org.eclipse.scout.repo.all.target_template.target b/org.eclipse.scout.repo.all.target/org.eclipse.scout.repo.all.target_template.target
index 23175e6..0d2fdfc 100644
--- a/org.eclipse.scout.repo.all.target/org.eclipse.scout.repo.all.target_template.target
+++ b/org.eclipse.scout.repo.all.target/org.eclipse.scout.repo.all.target_template.target
@@ -3,14 +3,14 @@
<target name="scout-repo-all-target.target">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="jar:$SCOUT_RT_RAP_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-4.3.0-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_RT_RAP_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-5.0.0-SNAPSHOT.zip!/"/>
<unit id="org.eclipse.scout.rt.rap.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.scout.rt.rap.testing.source.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="jar:$SCOUT_SDK_REPO_TARGET_LOCATION$/target/org.eclipse.scout.sdk-repository-4.3.0-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_SDK_REPO_TARGET_LOCATION$/target/org.eclipse.scout.sdk-repository-5.0.0-SNAPSHOT.zip!/"/>
<unit id="org.eclipse.scout.sdk.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.scout.sdk.rap.source.feature.group" version="0.0.0"/>
@@ -18,7 +18,7 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="jar:$SCOUT_RT_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt-repository-4.3.0-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_RT_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt-repository-5.0.0-SNAPSHOT.zip!/"/>
<unit id="org.eclipse.scout.rt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.scout.rt.testing.source.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.scout.repo.all.target/pom.xml b/org.eclipse.scout.repo.all.target/pom.xml
index 6fed8bf..ebb3fa2 100644
--- a/org.eclipse.scout.repo.all.target/pom.xml
+++ b/org.eclipse.scout.repo.all.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index 74442db..7efebc8 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.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -154,7 +154,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<configuration>
<updatesiteDir>${buildId}</updatesiteDir>
<compositeDir>${stageTargetDir}/scout.main</compositeDir>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
-Subproject 64d4d1fe2aa73ff161f04eabe6551796c310a06
+Subproject 3f93ca007801d368672c73a16ee0a715c337259
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
-Subproject 19966c60f5e6a6e8eaeff398455d2146d31a2b9
+Subproject 74014375016b8cd26d13f2b186a9952676dd0a8
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.xml b/org.eclipse.scout.rt.rap.target-feature/feature.xml
index 1e53370..3bba4da 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.3.0.qualifier"
+ version="5.0.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.3.0.qualifier"
+ version="5.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 32addb2..1855793 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.3.0-SNAPSHOT</version>
+ <version>5.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 ab3288f..5bc219e 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 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scout RAP Target
Bundle-SymbolicName: org.eclipse.scout.rt.rap.target
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Vendor: Eclipse Scout Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.scout.rt.rap.target/pom.xml b/org.eclipse.scout.rt.rap.target/pom.xml
index 9452183..e46caba 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.3.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
-Subproject 035a76cb94ac6ec194cbc8eda53162b9f90d029
+Subproject 1cc9fb5f4c5edf9e1d23dfcc22d722b1e785725
diff --git a/pom.xml b/pom.xml
index 4231f87..a67ebff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,12 @@
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>5.0.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.3.0</scout.base.version>
+ <scout.base.version>5.0.0</scout.base.version>
<tycho.version>0.20.0</tycho.version>
</properties>

Back to the top