Merge tag 'Luna_RC4'
diff --git a/.gitreview b/.gitreview
index 32d7ca0..f0c916c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,6 +2,6 @@
host=git.eclipse.org
port=29418
project=scout/org.eclipse.scout-aggregator.git
-defaultbranch=release/3.9.2
+defaultbranch=releases/4.0.x
defaultremote=origin
defaultrebase=0
diff --git a/checkoutCbiPlugins.sh b/checkoutCbiPlugins.sh
deleted file mode 100755
index 6bce350..0000000
--- a/checkoutCbiPlugins.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-LOCAL_DIR=org.eclipse.cbi.maven.plugins
-GIT_REPO=git://git.eclipse.org/gitroot/cbi/org.eclipse.cbi.maven.plugins.git
-BRANCH=master
-
-if [ ! -d "$LOCAL_DIR" ]; then
- git clone $GIT_REPO ./$LOCAL_DIR
-fi
-
-if [ -d "$LOCAL_DIR" ]; then
- cd $LOCAL_DIR
- git rm --cached -r . > /dev/null
- git reset --hard > /dev/null
- git checkout $BRANCH
- git pull
-else
- echo "Local directory $LOCAL_DIR does not exist!"
-fi
\ No newline at end of file
diff --git a/org.eclipse.scout-feature/build.properties b/org.eclipse.scout-feature/build.properties
index f59c616..c5ac4ff 100644
--- a/org.eclipse.scout-feature/build.properties
+++ b/org.eclipse.scout-feature/build.properties
@@ -8,6 +8,5 @@
bin.includes = feature.xml,\
feature.properties,\
about.html,\
- epl-v10.html,\
- license.html
+ epl-v10.html
diff --git a/org.eclipse.scout-feature/feature.properties b/org.eclipse.scout-feature/feature.properties
index f98f098..5379568 100644
--- a/org.eclipse.scout-feature/feature.properties
+++ b/org.eclipse.scout-feature/feature.properties
@@ -17,7 +17,7 @@
# "providerName" property - name of the company that provides the feature
providerName=Eclipse Scout Project
-updateSiteName=Kepler
+updateSiteName=Luna
# "description" property - description of the feature
description=Eclipse Scout is a business application framework that supports desktop, web and mobile frontends.\n\
@@ -35,135 +35,3 @@
Contributors:\n\
BSI Business Systems Integration AG - initial API and implementation\n
################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.scout-feature/feature.xml b/org.eclipse.scout-feature/feature.xml
index 52a66aa..9e63ec3 100644
--- a/org.eclipse.scout-feature/feature.xml
+++ b/org.eclipse.scout-feature/feature.xml
@@ -2,9 +2,11 @@
<feature
id="org.eclipse.scout"
label="%featureName"
- version="3.9.2.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
- plugin="org.eclipse.scout">
+ plugin="org.eclipse.scout"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
<description url="http://www.eclipse.org/scout/">
%description
@@ -19,15 +21,16 @@
</license>
<url>
- <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
- <discovery label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/releases/luna"/>
+ <discovery label="%updateSiteName" url="http://download.eclipse.org/releases/luna"/>
</url>
<requires>
- <import feature="org.eclipse.scout.rt.source" version="3.9.2" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.source" version="3.9.2" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.rap.source" version="3.9.2" match="compatible"/>
- <import feature="org.eclipse.scout.rt.testing.source" version="3.9.2" 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"/>
+ <import feature="org.eclipse.scout.rt.spec.source" version="4.0.0" match="compatible"/>
</requires>
</feature>
diff --git a/org.eclipse.scout-feature/license.html b/org.eclipse.scout-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.scout-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index 38ff70d..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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -25,6 +25,11 @@
<name>Eclipse Scout Feature</name>
+ <properties>
+ <target-platform>eclipse-3.7</target-platform>
+ <platform-version>[3.7,3.8)</platform-version>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
diff --git a/org.eclipse.scout.maven.plugins.updatesite/pom.xml b/org.eclipse.scout.maven.plugins.updatesite/pom.xml
index 541a16d..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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<dependencies>
@@ -82,6 +82,37 @@
</executions>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <versionRange>[3.2,)</versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ <goal>helpmojo</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
diff --git a/org.eclipse.scout.maven.plugins.updatesite/publish.sh b/org.eclipse.scout.maven.plugins.updatesite/publish.sh
index 05136a5..73ff3cf 100644
--- a/org.eclipse.scout.maven.plugins.updatesite/publish.sh
+++ b/org.eclipse.scout.maven.plugins.updatesite/publish.sh
@@ -80,6 +80,11 @@
fi
done
popd > /dev/null
+ # special handling for Scout 3.8 since folder structure is different.
+ if echo ${curdir} | grep -w -q "3.8"; then
+ echo -e "\t\tTruncating Scout ${curdir} composite dir"
+ truncateComposite "$curdir"
+ fi
}
## removes all folders starting with N that are not contained in the compositeContent.jar
@@ -88,7 +93,7 @@
compositeDir=$1
cd ${compositeDir}
- unzip -q compositeContent.jar
+ unzip -q -o compositeContent.jar
for sub in N*
do
echo -e "\t\t\tChecking nightly dir ${sub}"
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 90b4ec7..be41313 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -11,7 +11,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<prerequisites>
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>3.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.scout.parent</artifactId>
@@ -63,18 +63,18 @@
<properties>
<buildType>N</buildType>
- <stageTargetDir>nightly/3.9</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.version>3.9.2-SNAPSHOT</scout.version>
+ <scout.version>4.0.0-SNAPSHOT</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
- <tycho.version>0.19.0</tycho.version>
- <tycho-extras.version>0.19.0</tycho-extras.version>
- <cbi-plugins.version>1.0.4</cbi-plugins.version>
- <jarsigner.version>1.0.4</jarsigner.version>
+ <tycho.version>0.20.0</tycho.version>
+ <tycho-extras.version>0.20.0</tycho-extras.version>
+ <cbi-plugins.version>1.0.5</cbi-plugins.version>
+ <jarsigner.version>1.0.5</jarsigner.version>
<compileSource>1.6</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -82,13 +82,18 @@
<target-platform>eclipse-3.6</target-platform>
<rap-repo-target-platform>eclipse-staging</rap-repo-target-platform>
- <rap-repo-platform-version>[3.9,3.10)</rap-repo-platform-version>
+ <rap-repo-platform-version>[3.10,3.11)</rap-repo-platform-version>
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
- <cbi-jdt-version>3.9.0.v20130604-1421</cbi-jdt-version>
- <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
+ <cbi-jdt-version>3.10.0.v20140604-1726</cbi-jdt-version>
+ <cbi-snapshots-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-snapshots-repo.url>
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
+
+<!-- UI-Test (Tycho-Tests) Arguments -->
+ <ui.test.vmargs.all>${tycho.testArgLine} -Xms512m -Xmx1024m -XX:MaxPermSize=256m -DbuildingWithTycho=true</ui.test.vmargs.all>
+ <ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
+ <ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
</properties>
<repositories>
@@ -114,7 +119,7 @@
<id>cbi-snapshots</id>
<url>${cbi-snapshots-repo.url}</url>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
@@ -151,12 +156,6 @@
<filtering>true</filtering>
</testResource>
</testResources>
- <resources>
- <resource>
- <directory>resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<pluginManagement>
<plugins>
@@ -370,6 +369,9 @@
</excludes>
<!-- Kill test JVM if tests take more than 5 minutes (300 seconds) to finish -->
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <!-- do not abort on test failures -->
+ <failIfNoTests>false</failIfNoTests>
+ <testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
@@ -461,6 +463,14 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+
+ <!--Use this plugin to set the version to a release or snapshot in Manifests, poms, repositories-->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -534,6 +544,18 @@
</profile>
<profile>
+ <id>mac-test-vmargs</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <ui.test.vmargs>${ui.test.vmargs.all} ${ui.test.vmargs.mac}</ui.test.vmargs>
+ </properties>
+ </profile>
+
+ <profile>
<id>eclipse-sign</id>
<build>
<plugins>
@@ -697,10 +719,27 @@
</profile>
<profile>
+ <id>noJacoco</id>
+ <activation>
+ <property>
+ <name>!codecoverage</name>
+ </property>
+ </activation>
+ <properties>
+ <tycho.testArgLine></tycho.testArgLine>
+ </properties>
+ </profile>
+
+ <profile>
<id>jacoco</id>
+ <activation>
+ <property>
+ <name>codecoverage</name>
+ </property>
+ </activation>
<properties>
<!-- Jacoco version -->
- <jacoco.version>0.6.0.201210061924</jacoco.version>
+ <jacoco.version>0.6.3.201306030806</jacoco.version>
<!-- Sonar properties -->
<!-- Tells Sonar to reuse existing reports -->
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -916,7 +955,7 @@
</activation>
<properties>
<target-platform>eclipse-staging</target-platform>
- <platform-version>[3.9,3.10)</platform-version>
+ <platform-version>[3.10,3.11)</platform-version>
</properties>
</profile>
@@ -933,5 +972,33 @@
<platform-version>[3.9,3.10)</platform-version>
</properties>
</profile>
+
+ <profile>
+ <id>platform-luna-i</id>
+ <activation>
+ <property>
+ <name>platform-version-name</name>
+ <value>luna_I</value>
+ </property>
+ </activation>
+ <properties>
+ <target-platform>eclipse-3.10I</target-platform>
+ <platform-version>[3.10,3.11)</platform-version>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>platform-luna</id>
+ <activation>
+ <property>
+ <name>platform-version-name</name>
+ <value>luna</value>
+ </property>
+ </activation>
+ <properties>
+ <target-platform>eclipse-3.10</target-platform>
+ <platform-version>[3.10,3.11)</platform-version>
+ </properties>
+ </profile>
</profiles>
</project>
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 1782fd6..2d9da4a 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_3.9" location="http://download.eclipse.org/scout/nightly/3.9"/>
+ <repository id="scout_nightly" location="http://download.eclipse.org/scout/nightly"/>
<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_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-3.9.2-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_RT_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-4.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 dc59b47..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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -81,26 +81,6 @@
</replacements>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>target-platform-validation-plugin</artifactId>
- <version>${tycho-extras.version}</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>validate-target-platform</goal>
- </goals>
- <configuration>
- <targetFiles>
- <param>org.eclipse.scout.rap.basic.target.target</param>
- </targetFiles>
- <failOnError>true</failOnError>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/org.eclipse.scout.rap.repository/pom.xml b/org.eclipse.scout.rap.repository/pom.xml
index d1fb7b7..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.9.2-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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<executions>
<execution>
<id>stage</id>
diff --git a/org.eclipse.scout.repository/category.xml b/org.eclipse.scout.repository/category.xml
index 0c5e537..5bee74b 100644
--- a/org.eclipse.scout.repository/category.xml
+++ b/org.eclipse.scout.repository/category.xml
@@ -19,6 +19,10 @@
<feature url="features/org.eclipse.scout.rt.testing.source_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.testing.source" version="0.0.0">
<category name="Eclipse Scout RT"/>
</feature>
+ <feature url="features/org.eclipse.scout.rt.spec_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.spec" version="0.0.0"/>
+ <feature url="features/org.eclipse.scout.rt.spec.source_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.spec.source" version="0.0.0">
+ <category name="Eclipse Scout RT"/>
+ </feature>
<feature url="features/org.eclipse.scout.rt.testing.core_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.testing.core" version="0.0.0"/>
<feature url="features/org.eclipse.scout.rt.testing.core.source_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.testing.core.source" version="0.0.0"/>
<feature url="features/org.eclipse.scout.rt.testing.swing_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.testing.swing" version="0.0.0"/>
@@ -45,10 +49,10 @@
<feature url="features/org.eclipse.scout.rt.swt.source_0.0.0.qualifier.jar" id="org.eclipse.scout.rt.swt.source" version="0.0.0">
<category name="Eclipse Scout RT"/>
</feature>
- <bundle id="org.junit" version="0.0.0"/>
- <bundle id="org.junit.source" version="0.0.0"/>
- <bundle id="org.hamcrest.core" version="0.0.0"/>
- <bundle id="org.hamcrest.core.source" version="0.0.0"/>
+ <bundle id="org.junit" version="4.11.0.qualifier"/>
+ <bundle id="org.junit.source" version="4.11.0.qualifier"/>
+ <bundle id="org.hamcrest.core" version="1.3.0.qualifier"/>
+ <bundle id="org.hamcrest.core.source" version="1.3.0.qualifier"/>
<category-def name="Eclipse Scout SDK" label="Scout Application Development">
<description>Eclipse Scout is a business application framework that supports desktop, web and mobile frontends.
This category contains Eclipse Scout components that are intended to be added to your IDE.</description>
diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index 516520d..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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -27,6 +27,8 @@
<properties>
<p2repo-zip-path>${project.build.directory}/org.eclipse.scout.repository-${project.version}.zip</p2repo-zip-path>
+ <target-platform>eclipse-3.7</target-platform>
+ <platform-version>[3.7,3.8)</platform-version>
</properties>
<build>
@@ -153,7 +155,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>3.9.2-SNAPSHOT</version>
+ <version>4.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
index efd219c..e67b906 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit efd219cec93c68213f603359d867f325fd065206
+Subproject commit e67b9064600dc6f720564885f2f5cdcb829bc67f
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
index c545997..86eecd2 160000
--- a/org.eclipse.scout.rt.incubator
+++ b/org.eclipse.scout.rt.incubator
@@ -1 +1 @@
-Subproject commit c5459973cee5c98bdc7867cd783fc177f60713e0
+Subproject commit 86eecd2e9b927b2f6d2b3c41be58e5b430993b21
diff --git a/org.eclipse.scout.rt.rap.target-feature/build.properties b/org.eclipse.scout.rt.rap.target-feature/build.properties
index d7b1ae9..8ffa6e6 100644
--- a/org.eclipse.scout.rt.rap.target-feature/build.properties
+++ b/org.eclipse.scout.rt.rap.target-feature/build.properties
@@ -9,6 +9,5 @@
feature.properties,\
about.html,\
epl-v10.html,\
- license.html,\
p2.inf
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.properties b/org.eclipse.scout.rt.rap.target-feature/feature.properties
index 9e34cf4..876e3e7 100644
--- a/org.eclipse.scout.rt.rap.target-feature/feature.properties
+++ b/org.eclipse.scout.rt.rap.target-feature/feature.properties
@@ -17,7 +17,7 @@
# "providerName" property - name of the company that provides the feature
providerName=Eclipse Scout Project
-updateSiteName=Kepler
+updateSiteName=Luna
# "description" property - description of the feature
description=Eclipse Scout is a business application framework that supports desktop, web and mobile frontends.\n\
@@ -35,135 +35,3 @@
Contributors:\n\
BSI Business Systems Integration AG - initial API and implementation\n
################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.xml b/org.eclipse.scout.rt.rap.target-feature/feature.xml
index 73852d5..3c55ee8 100644
--- a/org.eclipse.scout.rt.rap.target-feature/feature.xml
+++ b/org.eclipse.scout.rt.rap.target-feature/feature.xml
@@ -2,9 +2,11 @@
<feature
id="org.eclipse.scout.rt.rap.target"
label="%featureName"
- version="3.9.2.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
- plugin="org.eclipse.scout.rt.rap.target">
+ plugin="org.eclipse.scout.rt.rap.target"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
<description url="http://www.eclipse.org/scout/">
%description
@@ -18,11 +20,16 @@
%license
</license>
+ <url>
+ <update label="%updateSiteName" url="http://download.eclipse.org/releases/luna"/>
+ <discovery label="%updateSiteName" url="http://download.eclipse.org/releases/luna"/>
+ </url>
+
<plugin
id="org.eclipse.scout.rt.rap.target"
download-size="0"
install-size="0"
- version="3.9.2.qualifier"
+ version="4.0.0.qualifier"
unpack="false"/>
</feature>
diff --git a/org.eclipse.scout.rt.rap.target-feature/license.html b/org.eclipse.scout.rt.rap.target-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.scout.rt.rap.target-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.scout.rt.rap.target-feature/pom.xml b/org.eclipse.scout.rt.rap.target-feature/pom.xml
index 2e1fb8d..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.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rt.rap.target/.project b/org.eclipse.scout.rt.rap.target/.project
index ac86c91..3758342 100644
--- a/org.eclipse.scout.rt.rap.target/.project
+++ b/org.eclipse.scout.rt.rap.target/.project
@@ -27,7 +27,6 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
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 9c85136..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.9.2.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/org.eclipse.scout.rt.rap.target_template.target b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
index 2fe9cd8..543ae69 100644
--- a/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
+++ b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-<target name="Rap" sequenceNumber="13">
+<?pde version="3.6"?><target name="Rap" sequenceNumber="13">
<locations>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="http://download.eclipse.org/rt/rap/2.1/SR2-20140210-0628/"/>
+ <repository id="rap_2.3" location="http://download.eclipse.org/rt/rap/2.3/RC4-20140610-0925/"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
</location>
diff --git a/org.eclipse.scout.rt.rap.target/pom.xml b/org.eclipse.scout.rt.rap.target/pom.xml
index a07d1bf..7adf9bd 100644
--- a/org.eclipse.scout.rt.rap.target/pom.xml
+++ b/org.eclipse.scout.rt.rap.target/pom.xml
@@ -16,13 +16,12 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>3.9.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
<artifactId>org.eclipse.scout.rt.rap.target</artifactId>
<packaging>eclipse-plugin</packaging>
-
<name>Eclipse Scout Rap Target</name>
<properties>
@@ -30,6 +29,7 @@
<target-gen-file-dir>${basedir}/generated</target-gen-file-dir>
<target-gen-filename>${project.artifactId}.target</target-gen-filename>
<target-gen-file>${target-gen-file-dir}/${target-gen-filename}</target-gen-file>
+ <target-gen-repo-dir>${target-gen-file-dir}/${project.artifactId}.repo</target-gen-repo-dir>
<target-output>${basedir}/resources/${project.artifactId}.repo</target-output>
<scout-rt-rap-repo-target-location>${project.baseUri}../org.eclipse.scout.rt/org.eclipse.scout.rt.rap-repository/target/repository/</scout-rt-rap-repo-target-location>
</properties>
@@ -146,11 +146,42 @@
</goals>
<configuration>
<sourceTargetFile>${target-gen-file}</sourceTargetFile>
- <outputRepository>${target-output}</outputRepository>
+ <outputRepository>${target-gen-repo-dir}</outputRepository>
</configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${target-output}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${target-gen-repo-dir}</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.pack.gz</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</profile>
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 308f8ac..a9dc0dd 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 308f8ac033daa3ac6abe7b358cf031ee6f524770
+Subproject commit a9dc0dd709ee72cdfdf2902ca2ab8d27ce003490
diff --git a/pom.xml b/pom.xml
index 4a6540f..0de5fd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,11 +15,12 @@
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>3.9.2-SNAPSHOT</version>
+ <version>4.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.0.0</scout.base.version>
</properties>
<distributionManagement>
@@ -73,5 +74,93 @@
<module>org.eclipse.scout.rap.basic.target</module>
</modules>
</profile>
+
+ <profile>
+ <id>prepare-release</id>
+ <properties>
+ <milestone.version>I</milestone.version>
+ <scout.build.version>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</scout.build.version>
+ </properties>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>org.eclipse.tycho:tycho-versions-plugin:set-version</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>set-version</id>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ <configuration>
+ <newVersion>${scout.build.version}</newVersion>
+ <properties>scout.version</properties>
+ <artifacts>eclipse.scout-aggregator,org.eclipse.scout.parent</artifacts>
+ </configuration>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>parent-only</id>
+
+ <modules>
+ <module>org.eclipse.scout.parent</module>
+ </modules>
+ </profile>
+
</profiles>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>target-platform-utils</artifactId>
+ <versionRange>[0.16.0.CR2,)</versionRange>
+ <goals>
+ <goal>mirror-target-to-repo</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <versionRange>[1.5.2,)</versionRange>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
diff --git a/updateSubmodules.bat b/updateSubmodules.bat
index 101c197..ecbf368 100644
--- a/updateSubmodules.bat
+++ b/updateSubmodules.bat
@@ -1 +1 @@
-git submodule foreach "(git rm --cached -r . > /dev/null; git reset --hard > /dev/null; git checkout master; git pull)"
+git submodule foreach "(git rm --cached -r . > /dev/null; git reset --hard > /dev/null; git checkout develop; git pull)"
diff --git a/updateSubmodules.sh b/updateSubmodules.sh
index 8683ec6..97e6550 100755
--- a/updateSubmodules.sh
+++ b/updateSubmodules.sh
@@ -1,8 +1,8 @@
#!/bin/sh
ROOT_PATH=`dirname $(readlink -f $0)`
-LOCAL_BRANCH="origin/release/3.9.2"
+LOCAL_BRANCH="develop"
BUILD_FROM_TAG="false"
-REMOTE_BRANCH="release/3.9.2"
+REMOTE_BRANCH="develop"
if [ ! -z "$1" ]; then
LOCAL_BRANCH=$1
