Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-06-26 08:29:47 -0400
committerQuentin Le Menez2018-06-28 07:59:26 -0400
commit96a16874383effdbf9b58d379415cc4da1d18180 (patch)
treedd5488ae174d94e18b80b1ff315a6efa338d849d
parent3ee0c59432c0d7b8b7fe3a25522b95cc881e6a34 (diff)
downloadorg.eclipse.papyrus-96a16874383effdbf9b58d379415cc4da1d18180.tar.gz
org.eclipse.papyrus-96a16874383effdbf9b58d379415cc4da1d18180.tar.xz
org.eclipse.papyrus-96a16874383effdbf9b58d379415cc4da1d18180.zip
Bug 536299 [releng] Update sdk and rcp for the next release
- Update the rcp and the sdk to avoid future misunderstanding and conflicts Change-Id: I074b76756528d8138772e329279bdb054e495bd3 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml2
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/pom.xml2
-rw-r--r--releng/main/site/category.xml4
-rw-r--r--releng/main/site/pom.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml6
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product11
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml2
-rw-r--r--releng/rcp/pom.xml2
-rw-r--r--releng/rcp/targetPlatform/pom.xml2
14 files changed, 22 insertions, 21 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 0260afcedc2..871c5168c94 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.sdk.feature"
label="Papyrus for UML"
- version="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.papyrus.sdk">
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
index 476e767383e..676bbe5d8df 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
index d1eafb34df6..3966d582c7f 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
index 5939cbabe7b..b6fe5c9b8d2 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index bbf91010ac4..f0bf462daf2 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.papyrus.sdk.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.0.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature_4.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.1.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.0.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.0.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.1.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 3975735756d..f261dcd2b64 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>org.eclipse.papyrus.p2</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index e5efa91efbc..04ac916cf74 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.rcp.feature"
label="Papyrus RCP Feature"
- version="4.0.0.qualifier"
+ version="4.1.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://www.eclipse.org/papyrus">
@@ -27,8 +27,8 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
- <discovery label="Oxygen" url="http://download.eclipse.org/releases/oxygen/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
+ <discovery label="Photon" url="http://download.eclipse.org/releases/photon/"/>
+ <discovery label="Eclipse Platform 4.8" url="http://download.eclipse.org/eclipse/updates/4.8"/>
</url>
<requires>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index e04e3402492..1ff8375691a 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index 46bbd97696c..a48a118f5a7 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="4.1.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
@@ -11,9 +11,9 @@
Version: {1}
Build id: {0}
-Copyright CEA LIST and others 2017. http://www.eclipse.org/papyrus
+Copyright CEA LIST and others 2018. http://www.eclipse.org/papyrus
-(c) Copyright Eclipse contributors and others 2000, 2017. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
+(c) Copyright Eclipse contributors and others 2000, 2018. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
</text>
@@ -47,6 +47,7 @@ This product includes software developed by other open source projects including
</win>
</launcher>
+
<vm>
</vm>
@@ -54,7 +55,7 @@ This product includes software developed by other open source projects including
<url>http://eclipse.org/legal/epl/notice.php</url>
<text>
Eclipse Foundation Software User Agreement
-February 1, 2017
+February 1, 2018
Usage Of Content
@@ -204,9 +205,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</configurations>
<repositories>
- <repository location="http://download.eclipse.org/releases/oxygen/" enabled="true" />
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/" enabled="true" />
<repository location="http://download.eclipse.org/eclipse/updates/4.8" enabled="true" />
+ <repository location="http://download.eclipse.org/releases/photon/" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 0ca3a92eb65..04573ae3298 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
index 594261cf3db..4c23e43a513 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.e4.ui.css.swt.theme
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Eclipse-BundleShape: dir
Bundle-Name: %pluginName
Bundle-Localization: plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 5e771a2c935..845a86a7d8e 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 003cad7a5f2..6b49429a666 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index 144d38b745c..4ae34aff5f9 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.target.parent</artifactId>

Back to the top