diff options
1133 files changed, 40173 insertions, 28949 deletions
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java index 8ad7691dbc6..8ea7ab8553d 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java @@ -1,492 +1,498 @@ -/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode;
-import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-/**
- * This is the main class that generates the EMF Validation plugin. It creates
- * extension points and adds required dependencies.
- *
- *
- */
-public class ValidationPluginGenerator {
-
- /**
- *
- */
- private static final String CONSTRAINT_S_IS_VIOLATED = "Constraint '%s' is violated"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_TARGET = "target"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_MESSAGE = "message"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_CLASS = "class"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$
-
- private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$
-
- /**
- * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL.
- * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin
- */
- private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_SEVERITY = "severity"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_STATUS_CODE = "statusCode"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_LANG = "lang"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_NAME = "name"; //$NON-NLS-1$
-
- private static final String SEPARATOR = "."; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_CHILD = "constraint"; //$NON-NLS-1$
-
- private static final String ATTRIB_ID = "id"; //$NON-NLS-1$
-
- private static final String ATTRIB_NAME = "name"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$
-
- private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$
-
- private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$
-
- // A generated plugin will depend on the validation profile, since it typically contains the profile as well.
- // [well, that's not always the case]
- public static final String UML_DSML_VALIDATION_PROFILE_PLUGIN = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$
-
- /**
- * singleton
- */
- public static ValidationPluginGenerator instance = new ValidationPluginGenerator();
-
- private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
- private IConstraintsManager constraintsManager;
-
- /**
- * Add a dependency to the plugin hosting the DSML profile.
- *
- * @param project
- * The Eclipse project
- * @return true, if dependency has been added
- * @throws CoreException
- * @throws IOException
- */
- public boolean addDependency(IProject project, String pluginName) throws CoreException, IOException {
-
- if ((project != null) && project.exists() && !pluginName.equals(project.getName())) {
- ManifestEditor manifest = new ManifestEditor(project);
- manifest.init();
- if (manifest.initOk() && !manifest.hasDependency(pluginName)) {
- manifest.addDependency(pluginName);
- manifest.save();
- return true;
- }
- }
- return false;
- }
-
- /**
- * Generate the java code form constraints contained in the profile
- *
- * @param project
- * the Eclipse project
- * @param constraintsManager
- * the class in charge to collect all information from the model
- * @param definition
- * The definition of the profile for which a plugin is generated
- * @throws CoreException
- * @throws IOException
- * @throws SAXException
- * @throws ParserConfigurationException
- */
- public void generate(IProject project, IConstraintsManager constraintsManager, EPackage definition) throws CoreException, IOException, SAXException, ParserConfigurationException {
- PluginEditor editor;
-
- this.constraintsManager = constraintsManager;
-
- // prepare the plugin
- editor = new PluginEditor(project);
- editor.registerSourceFolder(Generate.SRC);
- // it's possible that editor.getManifestEditor() logs an exception due to resource out of sync.
- String pluginID = editor.getSymbolicBundleName();
- if (editor.getBundleName() == null) {
- // initialize bundle name with symbolic name, if not name is given
- editor.setBundleName(pluginID);
- }
- editor.setSingleton(true);
- editor.getBuildEditor().addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
- Set<String> natures = new HashSet<String>();
- natures.add(PLUGIN_NATURE_ID);
- editor.addNatures(natures);
-
- editor.getManifestEditor().addDependency(EMF_VALIDATION_PLUGIN);
- editor.getManifestEditor().addDependency(UML_VALIDATION_PLUGIN);
- editor.getManifestEditor().addDependency(UML_PLUGIN);
-
- String filterName = "dsml.validation.generated" + SEPARATOR + this.constraintsManager.getPrimeCategory().getID(); //$NON-NLS-1$
- Element constraintProviderExtension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT, filterName);
-
- // creation of categories extension point
- // that corresponds to profile and sub-profiles
- this.createExtensionForCategory(pluginID, this.constraintsManager.getPrimeCategory(), constraintProviderExtension, editor);
-
- // add the constraint provider extension point, normally it exist only per profile so per category
- for (IConstraintProvider constraintProvider : constraintsManager.getConstraintsProviders()) {
- // create the extension point for the provider
- Element extElForConstraintsProvider = createExtensionForConstraintsProvider(constraintProvider, constraintProviderExtension, editor, definition);
- // go though category (profile)
- for (IConstraintsCategory constraintCategory : constraintProvider.getConstraintsCategories()) {
-
- // create the extension point validationRule for category
- Element extElForConstraintsCategory = createExtensionForConstraintsCategory(pluginID, constraintCategory, extElForConstraintsProvider, editor, constraintsManager);
-
- for (IValidationRule constraint : constraintCategory.getConstraints()) {
-
- // is this a Java constraint?
- if (Utils.hasSpecificationForJava(constraint.getConstraint())) {
- createJavaExtensionForConstraint(pluginID, constraint, extElForConstraintsCategory, editor);
- }
-
- // is this an OCL constraint?
- if (Utils.hasSpecificationForOCL(constraint.getConstraint())) {
- createOCLExtensionForConstraint(constraint, extElForConstraintsCategory, editor);
- }
- // ((ValidationRuleImpl) constraint).setParentID();
- }
-
- }
- }
-
- generateBindings(pluginID, editor, this.constraintsManager, filterName);
-
- try {
- editor.save();
- editor.getProject().refreshLocal(0, null);
- } catch (Throwable ex) {
- return;
- }
- }
-
- private Element createExtensionForConstraint(IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = editor.getPluginEditor().addChild(
- parentElement, EMF_VALIDATION_CONSTRAINT_CHILD);
-
- extElForConstraint.setAttribute(ATTRIB_ID, validationRule.getID());
- extElForConstraint.setAttribute(XML_CONSTRAINT_NAME, validationRule.getName());
- extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
- extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_MODE, validationRule.getMode().name());
- extElForConstraint.setAttribute(XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT,
- String.valueOf(validationRule.isEnabledByDefault()));
-
- if (validationRule.getTargets() != null) {
- for (String target : validationRule.getTargets()) {
- Element targetExtension = editor.addChild(extElForConstraint, XML_CONSTRAINT_TARGET);
- targetExtension.setAttribute(XML_CONSTRAINT_CLASS, target);
- }
- }
-
- String validationMsg = validationRule.getMessage();
- Element message = editor.addChild(extElForConstraint, XML_CONSTRAINT_MESSAGE);
- if ((validationMsg != null) && (validationMsg.length() > 0)) {
- message.setTextContent(validationMsg);
- } else {
- Package constraintPkg = validationRule.getConstraint().getNearestPackage();
- boolean set = false;
- if (constraintPkg != null) {
- MessageHandling messageHandling = UMLUtil.getStereotypeApplication(constraintPkg, MessageHandling.class);
- if (messageHandling != null) {
- if (messageHandling.getMessageMode() == NameBasedMsgMode.NAME_IS_MESSAGE) {
- message.setTextContent(validationRule.getName());
- set = true;
- } else if (messageHandling.getMessageMode() == NameBasedMsgMode.CUSTOM_TEMPLATE) {
- String template = messageHandling.getCustomTemplate();
- if (template != null && template.length() > 0) {
- message.setTextContent(String.format(template, validationRule.getName()));
- set = true;
- }
- }
- }
- }
- if (!set) {
- message.setTextContent(String.format(CONSTRAINT_S_IS_VIOLATED, validationRule.getName()));
- }
- }
-
- if (validationRule.getDescription() != null) {
- Element description = editor.addChild(extElForConstraint, "description"); //$NON-NLS-1$
- description.setTextContent(validationRule.getDescription());
- }
-
- return extElForConstraint;
- }
-
- private Element createJavaExtensionForConstraint(String pluginID, IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, JAVA_LANGUAGE);
- extElForConstraint.setAttribute(XML_CONSTRAINT_CLASS, pluginID + SEPARATOR + validationRule.getImplementingClass());
-
- return extElForConstraint;
-
- }
-
- /**
- * create the extension point for constraint of emf validation
- *
- * @param validationRule
- * the validation rule
- * @param parentElement
- * @param editor
- * @return the extension point
- */
- private Element createOCLExtensionForConstraint(IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, OCL_LANGUAGE);
- extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
- extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
- if (Utils.getOCLConstraintBody(validationRule.getConstraint()) != null) {
- Document doc = editor.getDocument();
-
- CDATASection cdata = doc.createCDATASection(Utils
- .getOCLConstraintBody(validationRule.getConstraint()));
- extElForConstraint.appendChild(cdata);
- }
-
- return extElForConstraint;
-
- }
-
- public static Document parseXmlFile(String filename, boolean validating) {
- try {
- // Create a builder factory
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- factory.setValidating(validating);
-
- // Create the builder and parse the file
- Document doc = factory.newDocumentBuilder().parse(
- new File(filename));
- return doc;
- } catch (SAXException e) {
- // A parsing error occurred; the xml input is not valid
- } catch (ParserConfigurationException e) {
- } catch (IOException e) {
- }
- return null;
- }
-
- /**
- * create the extension point categories
- *
- * @param projectName
- * the name of the project
- * @param category
- * a category
- * @param parentElement
- * a ConstraintProviders extension
- * @param editor
- */
- private Element createExtensionForCategory(String pluginID, Category category,
- Element parentElement, PluginEditor editor) {
-
- Element extElForCategory = editor.getPluginEditor().addChild(
- parentElement, "category"); //$NON-NLS-1$
-
- extElForCategory.setAttribute(ATTRIB_ID, pluginID + SEPARATOR + category.getID());
-
- extElForCategory.setAttribute(XML_CONSTRAINT_NAME, pluginID + SEPARATOR + category.getName());
-
- extElForCategory.setAttribute("mandatory", String.valueOf(category.isMandatory())); //$NON-NLS-1$
-
- return extElForCategory;
-
- }
-
- /**
- * create the constraint provider extension point
- *
- * @param constraintProvider
- * @param parentElement
- * @param editor
- * @param definition
- * @return the extension point
- */
- @SuppressWarnings("nls")
- private Element createExtensionForConstraintsProvider(
- IConstraintProvider constraintProvider, Element parentElement,
- PluginEditor editor, EPackage definition) {
-
- Element extElForConstraintsProvider = editor.getPluginEditor().addChild(parentElement, "constraintProvider");
-
- extElForConstraintsProvider.setAttribute(XML_CONSTRAINT_MODE, constraintProvider.getMode().name());
-
- extElForConstraintsProvider.setAttribute("cache", String.valueOf(constraintProvider.getCache()));
-
- Element pcg = editor.addChild(extElForConstraintsProvider, "package");
-
- if (constraintProvider.getEPackage() == null) {
- pcg.setAttribute("namespaceUri", UMLPackage.eNS_URI);
- } else {
- pcg.setAttribute("namespaceUri", constraintProvider.getEPackage().getNsURI());
-
- }
-
- return extElForConstraintsProvider;
- }
-
- @SuppressWarnings("nls")
- private Element createExtensionForConstraintsCategory(String pluginID, IConstraintsCategory constraintsCategory, Element parentElement, PluginEditor editor, IConstraintsManager constraintManager) {
- Element extElForConstraintsCategory = editor.getPluginEditor().addChild(parentElement, "constraints"); //$NON-NLS-1$
- extElForConstraintsCategory.setAttribute("categories", pluginID + SEPARATOR + constraintManager.getPrimeCategory().getName());
- return extElForConstraintsCategory;
-
- }
-
-
- @SuppressWarnings("nls")
- private void generateBindings(String pluginID, PluginEditor editor, IConstraintsManager constraintsManager, String filterName) {
- Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT, filterName);
-
- // create a client context per stereotype
- Set<Stereotype> constrainedStereotype = constraintsManager.getConstraintsOfStereotype().keySet();
- for (Iterator<Stereotype> iterator = constrainedStereotype.iterator(); iterator.hasNext();) {
- Stereotype stereotype = iterator.next();
- // ("+--> create clientContext for the stereotype "+stereotype.getName());
- Element clientContextElement = editor.getPluginEditor().addChild(extension, "clientContext");
- clientContextElement.setAttribute(ATTRIB_ID, stereotype.getName() + "ClientContext");
- Element selectorElement = editor.addChild(clientContextElement, "selector");
- selectorElement.setAttribute(XML_CONSTRAINT_CLASS, pluginID + ".selectors." + stereotype.getName() + "ClientSelector");
-
- // create binding
- List<Constraint> constraints = constraintsManager.getConstraintsOfStereotype().get(stereotype);
- Element bindingelement = editor.getPluginEditor().addChild(extension, "binding");
- bindingelement.setAttribute("context", stereotype.getName() + "ClientContext");
-
- for (Iterator<Constraint> iteratorConstraint = constraints.iterator(); iteratorConstraint.hasNext();) {
- Constraint constraint = iteratorConstraint.next();
- constraintsManager.getValidationRuleMap().get(constraint).getID();
- Element constraintElement = editor.addChild(bindingelement, "constraint");
- // The pluginID must be part of the fully qualified constraint reference
- constraintElement.setAttribute("ref", pluginID + SEPARATOR + constraintsManager.getValidationRuleMap().get(constraint).getID());
- // ("+----> create binding for the constraint "+constraintsManager.getValidationRuleMap().get(constraint).getID());
- }
- }
- }
-
- /**
- * Create a new extension with a given name or reuse an existing extension if an extension with the given
- * name already exists. In case of the latter, the existing extensions will be cleaned first, i.e. all of its
- * children are removed. This function enables multiple generation phases without duplicating elements.
- *
- * CAVEAT: This function has been changed: filtering is now based on its name instead of the ID. Using an
- * ID on the extension point level, unifies the associated contexts, see bug 467692 - [UML-RT] Multiple
- * issues when validating a UML-RT model
- *
- * @param editor
- * the plugin editor
- * @param extensionName
- * the name of the extension
- * @return
- */
- protected Element createOrCleanExtension(PluginEditor editor, String extensionName, String filterName) {
- List<Node> existingExtensions = editor.getPluginEditor().getExtensions(extensionName);
- for (Node extension : existingExtensions) {
- if (extension instanceof Element) {
- Element extensionElement = (Element) extension;
- // use optional name field to identify an item that has been generated by this plugin.
- // Context: bug 464363 - The DSML plugin generator removes all existing constraints from the plugin.xml
- String name = extensionElement.getAttribute(ATTRIB_NAME);
- // TODO: temporary accept entries without ID (ID == "") to avoid migration issues (bug 464363)
- if (name.equals("")) { //$NON-NLS-1$
- extensionElement.setAttribute(ATTRIB_NAME, filterName);
- name = filterName;
- }
- if (name.equals(filterName)) {
- // use existing extension and remove all children
- for (;;) {
- Node child = extension.getFirstChild();
- if (child == null) {
- break;
- }
- extension.removeChild(child);
- }
- return extensionElement;
- }
- }
- }
- // create new extension
- Element newExtension = editor.getPluginEditor().addExtension(extensionName);
- newExtension.setAttribute(ATTRIB_NAME, filterName);
- return newExtension;
- }
-
- public static String getContextprefix() {
- return ""; //$NON-NLS-1$
- }
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. + * + * 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 + * + * Contributors: + * Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation + * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.dsml.validation.wizard; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling; +import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode; +import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule; +import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils; +import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.eclipse.uml2.uml.Constraint; +import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Stereotype; +import org.eclipse.uml2.uml.UMLPackage; +import org.eclipse.uml2.uml.util.UMLUtil; +import org.w3c.dom.CDATASection; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + +/** + * This is the main class that generates the EMF Validation plugin. It creates + * extension points and adds required dependencies. + * + * + */ +public class ValidationPluginGenerator { + + /** + * + */ + private static final String CONSTRAINT_S_IS_VIOLATED = "Constraint '%s' is violated"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_TARGET = "target"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_MESSAGE = "message"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_CLASS = "class"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$ + + private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$ + + /** + * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL. + * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin + */ + private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_SEVERITY = "severity"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_STATUS_CODE = "statusCode"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_LANG = "lang"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_NAME = "name"; //$NON-NLS-1$ + + private static final String SEPARATOR = "."; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_CHILD = "constraint"; //$NON-NLS-1$ + + private static final String ATTRIB_ID = "id"; //$NON-NLS-1$ + + private static final String ATTRIB_NAME = "name"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$ + + private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$ + + private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$ + + // A generated plugin will depend on the validation profile, since it typically contains the profile as well. + // [well, that's not always the case] + public static final String UML_DSML_VALIDATION_PROFILE_PLUGIN = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$ + + /** + * singleton + */ + public static ValidationPluginGenerator instance = new ValidationPluginGenerator(); + + private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$ + + private IConstraintsManager constraintsManager; + + /** + * Add a dependency to the plugin hosting the DSML profile. + * + * @param project + * The Eclipse project + * @return true, if dependency has been added + * @throws CoreException + * @throws IOException + */ + public boolean addDependency(IProject project, String pluginName) throws CoreException, IOException { + + if ((project != null) && project.exists() && !pluginName.equals(project.getName())) { + ManifestEditor manifest = new ManifestEditor(project); + manifest.init(); + if (manifest.initOk() && !manifest.hasDependency(pluginName)) { + manifest.addDependency(pluginName); + manifest.save(); + return true; + } + } + return false; + } + + /** + * Generate the java code form constraints contained in the profile + * + * @param project + * the Eclipse project + * @param constraintsManager + * the class in charge to collect all information from the model + * @param definition + * The definition of the profile for which a plugin is generated + * @throws CoreException + * @throws IOException + * @throws SAXException + * @throws ParserConfigurationException + */ + public void generate(IProject project, IConstraintsManager constraintsManager, EPackage definition) throws CoreException, IOException, SAXException, ParserConfigurationException { + IPluginEditor editor; + + this.constraintsManager = constraintsManager; + + // prepare the plugin + editor = ProjectEditors.getPluginEditor(project); + if (!editor.exists()) { + editor.create(); + } + editor.init(); + + editor.registerSourceFolder(Generate.SRC); + // it's possible that editor.getManifestEditor() logs an exception due to resource out of sync. + String pluginID = editor.getSymbolicBundleName(); + if (editor.getBundleName() == null) { + // initialize bundle name with symbolic name, if not name is given + editor.setBundleName(pluginID); + } + editor.setSingleton(true); + editor.addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE); + Set<String> natures = new HashSet<String>(); + natures.add(PLUGIN_NATURE_ID); + editor.addNatures(natures); + + editor.addDependency(EMF_VALIDATION_PLUGIN); + editor.addDependency(UML_VALIDATION_PLUGIN); + editor.addDependency(UML_PLUGIN); + + String filterName = "dsml.validation.generated" + SEPARATOR + this.constraintsManager.getPrimeCategory().getID(); //$NON-NLS-1$ + Element constraintProviderExtension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT, filterName); + + // creation of categories extension point + // that corresponds to profile and sub-profiles + this.createExtensionForCategory(pluginID, this.constraintsManager.getPrimeCategory(), constraintProviderExtension, editor); + + // add the constraint provider extension point, normally it exist only per profile so per category + for (IConstraintProvider constraintProvider : constraintsManager.getConstraintsProviders()) { + // create the extension point for the provider + Element extElForConstraintsProvider = createExtensionForConstraintsProvider(constraintProvider, constraintProviderExtension, editor, definition); + // go though category (profile) + for (IConstraintsCategory constraintCategory : constraintProvider.getConstraintsCategories()) { + + // create the extension point validationRule for category + Element extElForConstraintsCategory = createExtensionForConstraintsCategory(pluginID, constraintCategory, extElForConstraintsProvider, editor, constraintsManager); + + for (IValidationRule constraint : constraintCategory.getConstraints()) { + + // is this a Java constraint? + if (Utils.hasSpecificationForJava(constraint.getConstraint())) { + createJavaExtensionForConstraint(pluginID, constraint, extElForConstraintsCategory, editor); + } + + // is this an OCL constraint? + if (Utils.hasSpecificationForOCL(constraint.getConstraint())) { + createOCLExtensionForConstraint(constraint, extElForConstraintsCategory, editor); + } + // ((ValidationRuleImpl) constraint).setParentID(); + } + + } + } + + generateBindings(pluginID, editor, this.constraintsManager, filterName); + + try { + editor.save(); + editor.getProject().refreshLocal(0, null); + } catch (Throwable ex) { + return; + } + } + + private Element createExtensionForConstraint(IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = editor.addChild(parentElement, EMF_VALIDATION_CONSTRAINT_CHILD); + + extElForConstraint.setAttribute(ATTRIB_ID, validationRule.getID()); + extElForConstraint.setAttribute(XML_CONSTRAINT_NAME, validationRule.getName()); + extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString()); + extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name()); + + extElForConstraint.setAttribute(XML_CONSTRAINT_MODE, validationRule.getMode().name()); + extElForConstraint.setAttribute(XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT, + String.valueOf(validationRule.isEnabledByDefault())); + + if (validationRule.getTargets() != null) { + for (String target : validationRule.getTargets()) { + Element targetExtension = editor.addChild(extElForConstraint, XML_CONSTRAINT_TARGET); + targetExtension.setAttribute(XML_CONSTRAINT_CLASS, target); + } + } + + String validationMsg = validationRule.getMessage(); + Element message = editor.addChild(extElForConstraint, XML_CONSTRAINT_MESSAGE); + if ((validationMsg != null) && (validationMsg.length() > 0)) { + message.setTextContent(validationMsg); + } else { + Package constraintPkg = validationRule.getConstraint().getNearestPackage(); + boolean set = false; + if (constraintPkg != null) { + MessageHandling messageHandling = UMLUtil.getStereotypeApplication(constraintPkg, MessageHandling.class); + if (messageHandling != null) { + if (messageHandling.getMessageMode() == NameBasedMsgMode.NAME_IS_MESSAGE) { + message.setTextContent(validationRule.getName()); + set = true; + } else if (messageHandling.getMessageMode() == NameBasedMsgMode.CUSTOM_TEMPLATE) { + String template = messageHandling.getCustomTemplate(); + if (template != null && template.length() > 0) { + message.setTextContent(String.format(template, validationRule.getName())); + set = true; + } + } + } + } + if (!set) { + message.setTextContent(String.format(CONSTRAINT_S_IS_VIOLATED, validationRule.getName())); + } + } + + if (validationRule.getDescription() != null) { + Element description = editor.addChild(extElForConstraint, "description"); //$NON-NLS-1$ + description.setTextContent(validationRule.getDescription()); + } + + return extElForConstraint; + } + + private Element createJavaExtensionForConstraint(String pluginID, IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor); + + extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, JAVA_LANGUAGE); + extElForConstraint.setAttribute(XML_CONSTRAINT_CLASS, pluginID + SEPARATOR + validationRule.getImplementingClass()); + + return extElForConstraint; + + } + + /** + * create the extension point for constraint of emf validation + * + * @param validationRule + * the validation rule + * @param parentElement + * @param editor + * @return the extension point + */ + private Element createOCLExtensionForConstraint(IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor); + + extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, OCL_LANGUAGE); + extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString()); + extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name()); + + if (Utils.getOCLConstraintBody(validationRule.getConstraint()) != null) { + Document doc = editor.getDocument(); + + CDATASection cdata = doc.createCDATASection(Utils + .getOCLConstraintBody(validationRule.getConstraint())); + extElForConstraint.appendChild(cdata); + } + + return extElForConstraint; + + } + + public static Document parseXmlFile(String filename, boolean validating) { + try { + // Create a builder factory + DocumentBuilderFactory factory = DocumentBuilderFactory + .newInstance(); + factory.setValidating(validating); + + // Create the builder and parse the file + Document doc = factory.newDocumentBuilder().parse( + new File(filename)); + return doc; + } catch (SAXException e) { + // A parsing error occurred; the xml input is not valid + } catch (ParserConfigurationException e) { + } catch (IOException e) { + } + return null; + } + + /** + * create the extension point categories + * + * @param projectName + * the name of the project + * @param category + * a category + * @param parentElement + * a ConstraintProviders extension + * @param editor + */ + private Element createExtensionForCategory(String pluginID, Category category, + Element parentElement, IPluginEditor editor) { + + Element extElForCategory = editor.addChild(parentElement, "category"); //$NON-NLS-1$ + + extElForCategory.setAttribute(ATTRIB_ID, pluginID + SEPARATOR + category.getID()); + + extElForCategory.setAttribute(XML_CONSTRAINT_NAME, pluginID + SEPARATOR + category.getName()); + + extElForCategory.setAttribute("mandatory", String.valueOf(category.isMandatory())); //$NON-NLS-1$ + + return extElForCategory; + + } + + /** + * create the constraint provider extension point + * + * @param constraintProvider + * @param parentElement + * @param editor + * @param definition + * @return the extension point + */ + @SuppressWarnings("nls") + private Element createExtensionForConstraintsProvider( + IConstraintProvider constraintProvider, Element parentElement, + IPluginEditor editor, EPackage definition) { + + Element extElForConstraintsProvider = editor.addChild(parentElement, "constraintProvider"); + + extElForConstraintsProvider.setAttribute(XML_CONSTRAINT_MODE, constraintProvider.getMode().name()); + + extElForConstraintsProvider.setAttribute("cache", String.valueOf(constraintProvider.getCache())); + + Element pcg = editor.addChild(extElForConstraintsProvider, "package"); + + if (constraintProvider.getEPackage() == null) { + pcg.setAttribute("namespaceUri", UMLPackage.eNS_URI); + } else { + pcg.setAttribute("namespaceUri", constraintProvider.getEPackage().getNsURI()); + + } + + return extElForConstraintsProvider; + } + + @SuppressWarnings("nls") + private Element createExtensionForConstraintsCategory(String pluginID, IConstraintsCategory constraintsCategory, Element parentElement, IPluginEditor editor, IConstraintsManager constraintManager) { + Element extElForConstraintsCategory = editor.addChild(parentElement, "constraints"); //$NON-NLS-1$ + extElForConstraintsCategory.setAttribute("categories", pluginID + SEPARATOR + constraintManager.getPrimeCategory().getName()); + return extElForConstraintsCategory; + + } + + + @SuppressWarnings("nls") + private void generateBindings(String pluginID, IPluginEditor editor, IConstraintsManager constraintsManager, String filterName) { + Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT, filterName); + + // create a client context per stereotype + Set<Stereotype> constrainedStereotype = constraintsManager.getConstraintsOfStereotype().keySet(); + for (Iterator<Stereotype> iterator = constrainedStereotype.iterator(); iterator.hasNext();) { + Stereotype stereotype = iterator.next(); + // ("+--> create clientContext for the stereotype "+stereotype.getName()); + Element clientContextElement = editor.addChild(extension, "clientContext"); + clientContextElement.setAttribute(ATTRIB_ID, stereotype.getName() + "ClientContext"); + Element selectorElement = editor.addChild(clientContextElement, "selector"); + selectorElement.setAttribute(XML_CONSTRAINT_CLASS, pluginID + ".selectors." + stereotype.getName() + "ClientSelector"); + + // create binding + List<Constraint> constraints = constraintsManager.getConstraintsOfStereotype().get(stereotype); + Element bindingelement = editor.addChild(extension, "binding"); + bindingelement.setAttribute("context", stereotype.getName() + "ClientContext"); + + for (Iterator<Constraint> iteratorConstraint = constraints.iterator(); iteratorConstraint.hasNext();) { + Constraint constraint = iteratorConstraint.next(); + constraintsManager.getValidationRuleMap().get(constraint).getID(); + Element constraintElement = editor.addChild(bindingelement, "constraint"); + // The pluginID must be part of the fully qualified constraint reference + constraintElement.setAttribute("ref", pluginID + SEPARATOR + constraintsManager.getValidationRuleMap().get(constraint).getID()); + // ("+----> create binding for the constraint "+constraintsManager.getValidationRuleMap().get(constraint).getID()); + } + } + } + + /** + * Create a new extension with a given name or reuse an existing extension if an extension with the given + * name already exists. In case of the latter, the existing extensions will be cleaned first, i.e. all of its + * children are removed. This function enables multiple generation phases without duplicating elements. + * + * CAVEAT: This function has been changed: filtering is now based on its name instead of the ID. Using an + * ID on the extension point level, unifies the associated contexts, see bug 467692 - [UML-RT] Multiple + * issues when validating a UML-RT model + * + * @param editor + * the plugin editor + * @param extensionName + * the name of the extension + * @return + */ + protected Element createOrCleanExtension(IPluginEditor editor, String extensionName, String filterName) { + List<Node> existingExtensions = editor.getExtensions(extensionName); + for (Node extension : existingExtensions) { + if (extension instanceof Element) { + Element extensionElement = (Element) extension; + // use optional name field to identify an item that has been generated by this plugin. + // Context: bug 464363 - The DSML plugin generator removes all existing constraints from the plugin.xml + String name = extensionElement.getAttribute(ATTRIB_NAME); + // TODO: temporary accept entries without ID (ID == "") to avoid migration issues (bug 464363) + if (name.equals("")) { //$NON-NLS-1$ + extensionElement.setAttribute(ATTRIB_NAME, filterName); + name = filterName; + } + if (name.equals(filterName)) { + // use existing extension and remove all children + for (;;) { + Node child = extension.getFirstChild(); + if (child == null) { + break; + } + extension.removeChild(child); + } + return extensionElement; + } + } + } + // create new extension + Element newExtension = editor.addExtension(extensionName); + newExtension.setAttribute(ATTRIB_NAME, filterName); + return newExtension; + } + + public static String getContextprefix() { + return ""; //$NON-NLS-1$ + } +} diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project index 97a4a24551d..17da5a7a1c3 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.dev.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.dev.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml index 6b5967ed2f4..d69dae3d247 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" - version="1.2.0.qualifier" + version="2.0.0.qualifier" provider-name="Eclipse Modeling Project"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> @@ -190,20 +190,6 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin - id="org.eclipse.papyrus.tests.framework" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.papyrus.tests.framework.annotations" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.tests.framework.edit" download-size="0" install-size="0" @@ -218,13 +204,6 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin - id="org.eclipse.upr.utp" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.dev.types" download-size="0" install-size="0" diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml index e1ee547fc4f..a7a1bfc0342 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>org.eclipse.papyrus.dev.feature</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> @@ -20,11 +20,11 @@ <artifactId>tycho-source-feature-plugin</artifactId> <configuration> <excludes> - <plugin id="org.eclipse.upr.utp" /> <!-- UPR doesn't provide sources --> + <plugin id="org.eclipse.upr.utp"/> <!-- UPR doesn't provide sources --> </excludes> </configuration> </plugin> </plugins> </pluginManagement> </build> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project b/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project index ffa9ad6c0bc..5142b8b03e2 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project +++ b/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project index 66cc40065d3..d57722d0f9d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project index df4ca5e1028..7df39335613 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.doc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.doc.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project index 91dee0ba9e2..2f5976755d7 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.editor.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.editor.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project index 09afdd3544b..0e7da471899 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project index e5cbd567ed7..35797d52547 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml index 2d1c24c5b58..de7e335bb93 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. @@ -25,8 +26,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.core.pluginexplorer" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/> - - <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.tools" install-size="0" unpack="false" version="0.0.0"/> </feature>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml index c30fc7b7fa6..04c21d5606e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project index f5dcf7e5440..0a4edf8ac3c 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.discovery.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.discovery.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml index 856a1f8b7bc..454eff235a1 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012 CEA LIST diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml index 909e724ea72..57aeba28e7d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.discovery.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project index 44e8c62b070..b28e36777fe 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml index 660c76d091a..980d6d01551 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012 CEA LIST diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml index 0255abfbf3f..0c99f7bd244 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project index 7b10b4f919e..c7c280cdbe2 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml index 4efee20e7c3..d02c98ed71a 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. @@ -21,8 +22,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.onefile" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.tools" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.edit" install-size="0" unpack="false" version="0.0.0"/> @@ -59,4 +58,4 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.editor" install-size="0" unpack="false" version="0.0.0"/> -</feature>
\ No newline at end of file +</feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml index 3b43a90f6a8..b9ed3b536ae 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project index 7905f6c0105..a4698a301ba 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project index c730aa684ee..f1a57bed486 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project index 6108308f887..ad516f6cd78 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project index 7d564c42456..8ba2d3475ff 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml index a1214fc1e37..60e8795562a 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml @@ -25,8 +25,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading.ui" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.services.validation" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.services.labelprovider" install-size="0" unpack="false" version="0.0.0"/> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project index d670d01258b..f9a6d2573a1 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml index d71c88771f9..1cd6426b3e0 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" provider-name="%featureProvider" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" provider-name="%featureProvider" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. @@ -22,6 +22,8 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.ui.resources" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.ui" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.infra.types.editor" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.types.ui" install-size="0" unpack="false" version="0.0.0"/> @@ -29,6 +31,12 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.services.edit.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/> + </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml index 1d7b941c1ec..908e0f77339 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project index 9f6d3376c43..933872d0ae3 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project index 581421a35e2..3b379974310 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.widget.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.widget.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml index 557a93d1ded..be36970a5b6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml index 99c6af530ba..d64b2841a86 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project index 5129d7edede..f3924954a3e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project @@ -1,17 +1,31 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sdk.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> 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 a421f6c519c..ad09be5d991 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 @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others 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 187fea7ba0d..d08359eab6f 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>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project index fb53f00a244..de36ea91909 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project index 7318149e47c..74b5b3966c5 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project index 6994ec54ff4..ce3bd67b87e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project index f06918a455a..29d11dd0dbb 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project index 7b2b5ea3b10..cee53390b48 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project index fb5313fabb5..17924f38fd6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project index f8bf2f873a0..42e605c3684 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml index cae7df46d7f..475482fabbd 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.assistants.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.uml.assistants.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml index 5c066c9bbe3..ddd4d42bcbc 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.assistants.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project index ba67a87a6d9..be1cb75c601 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project index c936b08cba8..e0b3c9d4d92 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.css.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.css.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project index 4711309f921..47c0a40c9a4 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project index 6b23aa6c20e..bc565f160e9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml index 6b2b498b058..cf3eddb343e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml index bc27b8099c7..3c60b3f8f6e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project index d37e39c6168..b851f459f9e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project index a40675027f9..64716128b8d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project index ef7f9b32f7f..7b25e025f17 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project index 474134de136..2b93e7543a6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.search.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.search.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project index 5371e47ca50..f6fe5327bf9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project index 6a2ee56a5dd..7d8570ac3bd 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.tools.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.tools.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project index f314bf4eae6..7a48e0c0322 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project index 15383c65f3e..4adb5f62a34 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.xtext.integration.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.xtext.integration.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project index bfe5ebe36cc..d45fd70ea4e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project index 76b17538375..b855c926921 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project index b8900a96b03..85b0961deb8 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.search.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.search.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project index 7618143509d..0bc70e1b0bf 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project index c1c9b5ec9f9..7679c02f662 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.emf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes.emf</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF index fa5476b9585..1d587c3cd42 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF @@ -1,8 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project index 04c2b52c2c3..7d9bff6670c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.uml</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes.uml</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF index 60932311477..3ebe24c5f4e 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF @@ -1,8 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project index f75d3c9557e..9b0f9d6d912 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF index 0dbaaf4c19c..f6b37ead789 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF @@ -1,7 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/.project b/plugins/customization/org.eclipse.papyrus.customization.palette/.project index cdc3f107099..31cb9051c27 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.palette</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.palette</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF index ce0a4749a96..db16d3489c6 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF @@ -1,27 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.palette,
- org.eclipse.papyrus.customization.palette.dialog,
- org.eclipse.papyrus.customization.palette.proxies
-Require-Bundle: org.eclipse.pde;bundle-version="3.6.0",
- org.eclipse.pde.ui;bundle-version="3.6.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.palette, + org.eclipse.papyrus.customization.palette.dialog, + org.eclipse.papyrus.customization.palette.proxies +Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project index e6fc7832d9a..955406ef912 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.paletteconfiguration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.paletteconfiguration</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF index 6e7d1118c33..ea75d018a7c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF @@ -1,20 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
- org.eclipse.papyrus.customization.paletteconfiguration.queries
-Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.paletteconfiguration, + org.eclipse.papyrus.customization.paletteconfiguration.queries +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project index e94613a0d4e..6bd7d558acb 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project @@ -1,38 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.generation</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>transforms</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties.generation</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name> + <arguments> + <dictionary> + <key>src_container</key> + <value>transforms</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF index c0d8e21fed1..28272f0cbd3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF @@ -1,45 +1,26 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.generation,
- org.eclipse.papyrus.customization.properties.generation.generators,
- org.eclipse.papyrus.customization.properties.generation.layout,
- org.eclipse.papyrus.customization.properties.generation.wizard,
- org.eclipse.papyrus.customization.properties.generation.wizard.widget
-Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
- org.eclipse.osgi;bundle-version="3.6.1",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.0.1",
- org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- org.eclipse.papyrus.customization.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.jface.databinding;bundle-version="1.6.200",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Eclipse-BuddyPolicy: dependent
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.generation, + org.eclipse.papyrus.customization.properties.generation.generators, + org.eclipse.papyrus.customization.properties.generation.layout, + org.eclipse.papyrus.customization.properties.generation.wizard, + org.eclipse.papyrus.customization.properties.generation.wizard.widget +Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)", + org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.customization.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + bin +Bundle-Version: 1.2.0.qualifier +Eclipse-BuddyPolicy: dependent +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project index c206f4a22bc..ada41a4b484 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project @@ -1,38 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.model.xwt</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>Transformation</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties.model.xwt</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name> + <arguments> + <dictionary> + <key>src_container</key> + <value>Transformation</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF index 1299b08a90f..e991aa76ae3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF @@ -1,26 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.m2m.qvt.oml;bundle-version="3.1.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.wst.xml.core;bundle-version="1.1.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- com.ibm.icu
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util +Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)", + org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)", + com.ibm.icu +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.project b/plugins/customization/org.eclipse.papyrus.customization.properties/.project index 8e74255f24f..8a52bef694f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/.project @@ -1,30 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF index 357df2e8e0e..991b43e4216 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF @@ -1,37 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.editor,
- org.eclipse.papyrus.customization.properties.modelelement,
- org.eclipse.papyrus.customization.properties.providers,
- org.eclipse.papyrus.customization.properties.storage.actions
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.databinding.observable;bundle-version="1.3.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.emf.ecore.editor;bundle-version="2.6.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints.ui;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.editor, + org.eclipse.papyrus.customization.properties.modelelement, + org.eclipse.papyrus.customization.properties.providers, + org.eclipse.papyrus.customization.properties.storage.actions +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + bin +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF index a70b7b15fc8..fdde98c5b9d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF @@ -1,23 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.emf.ecore, - org.eclipse.pde;bundle-version="3.6.100", - org.eclipse.core.resources;bundle-version="3.7.100", - org.eclipse.pde.core;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.pde.ui;bundle-version="3.6.100", - org.eclipse.ui.ide;bundle-version="3.7.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.0", - org.eclipse.emf.edit;bundle-version="2.7.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0" +Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.customization.factory, org.eclipse.papyrus.customization.generator, org.eclipse.papyrus.customization.model.customizationplugin, diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java index 085556890f3..21524cedd5b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java @@ -1,43 +1,43 @@ -/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory {
-
- public ConstraintEnvironmentExtensionFactory() {
- super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2011 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 + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.customization.factory; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; + + +public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory { + + public ConstraintEnvironmentExtensionFactory() { + super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$ + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment(); + } + +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java index 79fe0e89fa2..9f906d6f0fc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java @@ -1,29 +1,31 @@ -/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public interface ExtensionFactory {
-
- public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance;
-
- public void addElement(CustomizableElement element, PluginEditor editor);
-
- public EClass getCustomizableElementClass();
-
- public String getName();
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. + * + * 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 + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.customization.factory; + + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; + + +public interface ExtensionFactory { + + public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance; + + public void addElement(CustomizableElement element, IPluginEditor editor); + + public EClass getCustomizableElementClass(); + + public String getName(); +} diff --git a/plugins/customization/org.ecl |