From 96a16874383effdbf9b58d379415cc4da1d18180 Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Tue, 26 Jun 2018 14:29:47 +0200 Subject: 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 --- releng/main/site/category.xml | 4 ++-- releng/main/site/pom.xml | 2 +- releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml | 6 +++--- releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml | 2 +- releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product | 11 ++++++----- releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml | 2 +- releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF | 2 +- releng/rcp/org.eclipse.papyrus.rcp/pom.xml | 2 +- releng/rcp/pom.xml | 2 +- releng/rcp/targetPlatform/pom.xml | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) (limited to 'releng') 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 @@ - + - + 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 @@ org.eclipse.papyrus.p2 - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT eclipse-repository 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 @@ @@ -27,8 +27,8 @@ http://www.eclipse.org/legal/epl-v10.html - - + + 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 @@ org.eclipse.papyrus.rcp.releng org.eclipse.papyrus - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT .. 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 @@ - + @@ -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'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'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/. @@ -47,6 +47,7 @@ This product includes software developed by other open source projects including + @@ -54,7 +55,7 @@ This product includes software developed by other open source projects including http://eclipse.org/legal/epl/notice.php 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 - + 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 @@ org.eclipse.papyrus.rcp.releng org.eclipse.papyrus - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT .. 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 @@ org.eclipse.papyrus.rcp.releng org.eclipse.papyrus - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT .. 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 @@ org.eclipse.papyrus.rcp.releng - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT pom 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 @@ org.eclipse.papyrus.rcp.releng org.eclipse.papyrus - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT org.eclipse.papyrus.rcp.target.parent -- cgit v1.2.3