Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2019-06-17 14:16:40 +0000
committerQuentin Le Menez2019-06-21 13:52:38 +0000
commitc33034019473d4fcb39727244847a21f9c576161 (patch)
treeca8d0a88dc9f0fbec45dfad678fd0266a462d08b
parent76f66d04d3cde2f2002f386c64a02627c7eb9195 (diff)
downloadorg.eclipse.papyrus-c33034019473d4fcb39727244847a21f9c576161.tar.gz
org.eclipse.papyrus-c33034019473d4fcb39727244847a21f9c576161.tar.xz
org.eclipse.papyrus-c33034019473d4fcb39727244847a21f9c576161.zip
Bug 545631 - [Releng] Update Papyrus version to the 4.5.0 nighlty
- Bump the sdk, category and rcp references Change-Id: I843d2de1c3df2ce8f5272a6d32f424b4114116ee 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.properties2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml7
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product7
-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
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg10
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.xml4
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/splash.bmpbin322138 -> 358830 bytes
-rw-r--r--releng/rcp/pom.xml4
-rw-r--r--releng/rcp/targetPlatform/pom.xml2
18 files changed, 30 insertions, 28 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 380b1c5dea1..b27abce6486 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="%featureName"
- version="4.4.0.qualifier"
+ version="4.5.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.papyrus.sdk"
license-feature="org.eclipse.license"
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 4f23d780d84..e4dff49c056 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,7 +7,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
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 5ee9b97473e..a835a908699 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.4.0.qualifier
+Bundle-Version: 4.5.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 1a25172aa37..7e4b478d3f3 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.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index 5d043816b9d..b31a7574d4c 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.4.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.4.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature_4.5.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="4.5.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.4.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.4.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature.source_4.5.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="4.5.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 75ca2b9a8e1..85e9ab6897b 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.papyrus.p2</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
index bab92a402c0..27ce7175c6e 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
@@ -24,7 +24,7 @@ as indicated by feature numbers less than 1.0.0 on the feature list.\n
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2017 CEA LIST.\n\
+Copyright (c) 2019 CEA LIST.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License 2.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index bd405822fdd..ef20eae8390 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="%featureName"
- version="4.4.0.qualifier"
+ version="4.5.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.0">
@@ -20,8 +20,9 @@
</license>
<url>
- <discovery label="2019-03" url="http://download.eclipse.org/releases/2019-03/"/>
- <discovery label="Eclipse Platform 4.11" url="http://download.eclipse.org/eclipse/updates/4.11"/>
+ <discovery label="2019-06" url="http://download.eclipse.org/releases/2019-06/"/>
+ <discovery label="2019-09" url="http://download.eclipse.org/staging/2019-09/"/>
+ <discovery label="Eclipse Platform 4.12" url="http://download.eclipse.org/eclipse/updates/4.12"/>
</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 444e4d39b41..4230f78e09b 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.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 3653b8ce0a1..ea7c064edd4 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.4.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.5.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
@@ -206,8 +206,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<repositories>
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
- <repository location="http://download.eclipse.org/releases/2019-03/" enabled="true" />
- <repository location="http://download.eclipse.org/eclipse/updates/4.11/" enabled="true" />
+ <repository location="http://download.eclipse.org/releases/2019-06/" enabled="true" />
+ <repository location="http://download.eclipse.org/staging/2019-09/" enabled="true" />
+ <repository location="http://download.eclipse.org/eclipse/updates/4.12/" 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 a00916ec67c..435e37127f0 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.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 c12032b3bd4..8ed8087d099 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.4.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Eclipse-BundleShape: dir
Bundle-Name: %pluginName
Bundle-Localization: plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
index 663dbcfd7ad..cb693311926 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -23,15 +23,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1380"
+ inkscape:window-width="1810"
inkscape:window-height="898"
id="namedview334"
showgrid="false"
inkscape:zoom="0.953584"
- inkscape:cx="-147.01777"
+ inkscape:cx="-338.40101"
inkscape:cy="80.855544"
- inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-x="164"
+ inkscape:window-y="124"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
@@ -1779,5 +1779,5 @@
id="tspan4832"
x="197.48167"
y="240.93285"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.49736595px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1">2019-06N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.49736595px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1">2019-09N</tspan></text>
</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
index 53893bd8f28..48fe08c0d48 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
@@ -6,7 +6,7 @@
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
- description="Papyrus&#x0D;&#x0A;&#x0D;&#x0A;Version: {1}&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2017. All rights reserved.&#x0D;&#x0A;Visit http://www.eclipse.org/platform&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the&#x0D;&#x0A;Apache Software Foundation http://www.apache.org/"
+ description="Papyrus&#x0D;&#x0A;&#x0D;&#x0A;Version: {1}&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright Eclipse contributors and others 2000-2019. All rights reserved.&#x0D;&#x0A;Visit http://www.eclipse.org/platform&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the&#x0D;&#x0A;Apache Software Foundation http://www.apache.org/"
name="Papyrus">
<property name="windowImages" value="icons/papyrus16.png,icons/papyrus32.png,icons/papyrus48.png,icons/papyrus64.png,icons/papyrus128.png"/>
<property name="aboutImage" value="icons/papyrus_lg.png"/>
@@ -47,7 +47,7 @@
</property>
<property
name="aboutText"
- value="Papyrus&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;Copyright CEA LIST and others 2017. http://www.eclipse.org/papyrus&#x0A;&#x0A;(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'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.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.&#x0A;">
+ value="Papyrus&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;Copyright CEA LIST and others 2019. http://www.eclipse.org/papyrus&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000-2019. 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'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.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.&#x0A;">
</property>
<property
name="preferenceCustomization"
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 00b0d07d1a6..2e7462575de 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
index c1538a4ac35..24de28734d3 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
+++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
Binary files differ
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 5d97dce79f3..599f9da921a 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -26,7 +26,7 @@
<eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
<!-- Human readable name of the release, e.g. used in the about dialog
(see about.mappings) -->
- <eclipse.simultaneous.release.name>2019-03 (4.11)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2019-09 (4.13)</eclipse.simultaneous.release.name>
<target.platform>org.eclipse.papyrus.rcp.${target.suffix}.target</target.platform>
</properties>
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index f90cd4fe126..a25334363ff 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.target.parent</artifactId>

Back to the top