From 3e9e8ce978ea0a840eaf7963e3057c612be55541 Mon Sep 17 00:00:00 2001
From: Florian Noyrit
Date: Thu, 9 Jun 2016 10:45:06 +0200
Subject: Bug 483774 - Releng - Update RCP for Oxygen release
Change-Id: I4c9196821c8a44ea38c1f44eedd974e53aa416b8
---
.../org.eclipse.papyrus.rcp.feature/feature.xml | 162 ++++----
releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml | 28 +-
.../papyrus.product | 438 ++++++++++-----------
releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml | 134 +++----
.../org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF | 2 +-
releng/rcp/org.eclipse.papyrus.rcp/pom.xml | 28 +-
releng/rcp/pom.xml | 254 ++++++------
releng/rcp/targetPlatform/pom.xml | 38 +-
8 files changed, 542 insertions(+), 542 deletions(-)
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index a5a1e3e3144..b372f6028fa 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -1,81 +1,81 @@
-
-
-
-
- This package contains Papyrus and a collection of Eclipse Modeling
-Project components, including EMF, MDT XSD/OCL/UML2 elements.
-It includes a complete SDK, developer tools and source code.
-Note that the Modeling package includes some incubating components,
-as indicated by feature numbers less than 1.0.0 on the feature list.
-
-
-
- Copyright (c) 2015 CEA LIST.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-
-
- %licence
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ This package contains Papyrus and a collection of Eclipse Modeling
+Project components, including EMF, MDT XSD/OCL/UML2 elements.
+It includes a complete SDK, developer tools and source code.
+Note that the Modeling package includes some incubating components,
+as indicated by feature numbers less than 1.0.0 on the feature list.
+
+
+
+ Copyright (c) 2015 CEA LIST.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+
+
+ %licence
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index b211feb287c..8acbf89c923 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -1,14 +1,14 @@
-
-
- 4.0.0
-
- org.eclipse.papyrus.rcp.releng
- org.eclipse.papyrus
- 1.2.0-SNAPSHOT
- ..
-
- org.eclipse.papyrus
- org.eclipse.papyrus.rcp.feature
- 1.2.0-SNAPSHOT
- eclipse-feature
-
+
+
+ 4.0.0
+
+ org.eclipse.papyrus.rcp.releng
+ org.eclipse.papyrus
+ 2.1.0-SNAPSHOT
+ ..
+
+ org.eclipse.papyrus
+ org.eclipse.papyrus.rcp.feature
+ 2.1.0-SNAPSHOT
+ eclipse-feature
+
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index f28c0928eec..8d5b9a58a7a 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,219 +1,219 @@
-
-
-
-
-
-
-
-
- Papyrus
-
-Version: {1}
-Build id: {0}
-
-Copyright CEA LIST and others 2015. http://www.eclipse.org/papyrus
-
-(c) Copyright Eclipse contributors and others 2000, 2015. 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/.
-
-
-
-
-
-
-
- -showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile
-
- -Xms128m -Xmx900m
-
- -Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- http://eclipse.org/legal/epl/notice.php
-
- Eclipse Foundation Software User Agreement
-February 1, 2015
-
-Usage Of Content
-
-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.
-
-Applicable Licenses
-
-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 http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-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").
-
- - 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").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
- in a directory named "plugins".
- - 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.
- - 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.
-
-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:
-
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
-
-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.
-
-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):
-
- - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
-
-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.
-
-Use of Provisioning Technology
-
-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
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
-
-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:
-
- 1. 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.
- 2. 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.
- 3. 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.
-
-Cryptography
-
-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.
-
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Papyrus
+
+Version: {1}
+Build id: {0}
+
+Copyright CEA LIST and others 2015. http://www.eclipse.org/papyrus
+
+(c) Copyright Eclipse contributors and others 2000, 2015. 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/.
+
+
+
+
+
+
+
+ -showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile
+
+ -Xms128m -Xmx900m
+
+ -Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ http://eclipse.org/legal/epl/notice.php
+
+ Eclipse Foundation Software User Agreement
+February 1, 2015
+
+Usage Of Content
+
+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.
+
+Applicable Licenses
+
+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 http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+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").
+
+ - 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").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
+ in a directory named "plugins".
+ - 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.
+ - 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.
+
+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:
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+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.
+
+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):
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+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.
+
+Use of Provisioning Technology
+
+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
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+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:
+
+ 1. 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.
+ 2. 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.
+ 3. 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.
+
+Cryptography
+
+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.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 47bbef22d69..40d18693557 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -1,67 +1,67 @@
-
-
- 4.0.0
-
- org.eclipse.papyrus.rcp.releng
- org.eclipse.papyrus
- 1.2.0-SNAPSHOT
- ..
-
- org.eclipse.papyrus
- org.eclipse.papyrus.rcp.product
- 1.2.0-SNAPSHOT
- eclipse-repository
-
- org.eclipse.papyrus.rcp.product
-
-
-
-
- org.eclipse.tycho
- tycho-p2-repository-plugin
- ${tycho-version}
-
- true
-
-
-
- org.eclipse.tycho
- tycho-p2-director-plugin
- ${tycho-version}
-
- org.eclipse.papyrus
-
- tar.gz
- tar.gz
- tar.gz
-
-
-
- ${product-id}
- Papyrus
-
- Papyrus.app
- Papyrus
- Papyrus
-
-
-
-
-
-
- materialize-products
-
- materialize-products
-
-
-
- archive-products
-
- archive-products
-
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ org.eclipse.papyrus.rcp.releng
+ org.eclipse.papyrus
+ 2.1.0-SNAPSHOT
+ ..
+
+ org.eclipse.papyrus
+ org.eclipse.papyrus.rcp.product
+ 2.1.0-SNAPSHOT
+ eclipse-repository
+
+ org.eclipse.papyrus.rcp.product
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-repository-plugin
+ ${tycho-version}
+
+ true
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho-version}
+
+ org.eclipse.papyrus
+
+ tar.gz
+ tar.gz
+ tar.gz
+
+
+
+ ${product-id}
+ Papyrus
+
+ Papyrus.app
+ Papyrus
+ Papyrus
+
+
+
+
+
+
+ materialize-products
+
+ materialize-products
+
+
+
+ archive-products
+
+ archive-products
+
+
+
+
+
+
+
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 7a57c428341..0ec800aade2 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: 1.2.0.qualifier
+Bundle-Version: 2.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 c14d89bbba1..2ab5981aab1 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -1,14 +1,14 @@
-
-
- 4.0.0
-
- org.eclipse.papyrus.rcp.releng
- org.eclipse.papyrus
- 1.2.0-SNAPSHOT
- ..
-
- org.eclipse.papyrus
- org.eclipse.papyrus.rcp
- 1.2.0-SNAPSHOT
- eclipse-plugin
-
+
+
+ 4.0.0
+
+ org.eclipse.papyrus.rcp.releng
+ org.eclipse.papyrus
+ 2.1.0-SNAPSHOT
+ ..
+
+ org.eclipse.papyrus
+ org.eclipse.papyrus.rcp
+ 2.1.0-SNAPSHOT
+ eclipse-plugin
+
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 953d6573adb..d2a5c2762bc 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -1,127 +1,127 @@
-
-
- 4.0.0
-
- org.eclipse.papyrus
- org.eclipse.papyrus.all.releng
- 0.0.1-SNAPSHOT
-
- org.eclipse.papyrus
- org.eclipse.papyrus.rcp.releng
- 1.2.0-SNAPSHOT
- pom
-
- org.eclipse.papyrus.rcp
- org.eclipse.papyrus.rcp.feature
- org.eclipse.papyrus.rcp.product
- targetPlatform
-
-
-
- ${maven.build.timestamp}
-
- Neon Milestone 3 (4.6.0M3)
- org.eclipse.papyrus.rcp.${target.suffix}.target
-
-
-
-
- papyrus-main
- p2
- ${papyrus.repo.main}
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-maven-plugin
- ${tycho-version}
- true
-
-
- org.eclipse.tycho
- tycho-versions-plugin
- ${tycho-version}
-
-
- org.eclipse.tycho
- target-platform-configuration
-
-
-
- org.eclipse.tycho
- tycho-source-plugin
- ${tycho-version}
-
-
- plugin-source
-
- plugin-source
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
-
-
-
- update-branding-plugins-about.mappings
-
-
- ${basedir}/about.mappings
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
- process-about.mappings
- prepare-package
-
- ${project.build.directory}
- true
-
-
- ${basedir}
-
- about.mappings
-
- true
-
-
-
-
- copy-resources
-
-
-
-
-
- org.eclipse.tycho
- tycho-packaging-plugin
- ${tycho-version}
-
-
-
- ${project.build.directory}
-
- about.mappings
-
-
-
-
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ org.eclipse.papyrus
+ org.eclipse.papyrus.all.releng
+ 0.0.1-SNAPSHOT
+
+ org.eclipse.papyrus
+ org.eclipse.papyrus.rcp.releng
+ 2.1.0-SNAPSHOT
+ pom
+
+ org.eclipse.papyrus.rcp
+ org.eclipse.papyrus.rcp.feature
+ org.eclipse.papyrus.rcp.product
+ targetPlatform
+
+
+
+ ${maven.build.timestamp}
+
+ Oxygen (4.7.0)
+ org.eclipse.papyrus.rcp.${target.suffix}.target
+
+
+
+
+ papyrus-main
+ p2
+ ${papyrus.repo.main}
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-maven-plugin
+ ${tycho-version}
+ true
+
+
+ org.eclipse.tycho
+ tycho-versions-plugin
+ ${tycho-version}
+
+
+ org.eclipse.tycho
+ target-platform-configuration
+
+
+
+ org.eclipse.tycho
+ tycho-source-plugin
+ ${tycho-version}
+
+
+ plugin-source
+
+ plugin-source
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+
+
+
+ update-branding-plugins-about.mappings
+
+
+ ${basedir}/about.mappings
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ process-about.mappings
+ prepare-package
+
+ ${project.build.directory}
+ true
+
+
+ ${basedir}
+
+ about.mappings
+
+ true
+
+
+
+
+ copy-resources
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-packaging-plugin
+ ${tycho-version}
+
+
+
+ ${project.build.directory}
+
+ about.mappings
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index b01469ebfcf..973a791905b 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -1,19 +1,19 @@
-
-
- 4.0.0
-
-
- org.eclipse.papyrus.rcp.releng
- org.eclipse.papyrus
- 1.2.0-SNAPSHOT
-
-
- org.eclipse.papyrus.rcp.target.parent
- 0.0.1-SNAPSHOT
- pom
-
-
- portable
- eclipse
-
-
+
+
+ 4.0.0
+
+
+ org.eclipse.papyrus.rcp.releng
+ org.eclipse.papyrus
+ 2.1.0-SNAPSHOT
+
+
+ org.eclipse.papyrus.rcp.target.parent
+ 0.0.1-SNAPSHOT
+ pom
+
+
+ portable
+ eclipse
+
+
--
cgit v1.2.3