[358558] - [project] Major version change to 4.0.

- There was still some pending features.

5 files changed, 251 insertions, 214 deletions

diff --git a/features/org.eclipse.ocl-feature/feature.xml b/features/org.eclipse.ocl-feature/feature.xml
index 9949ab3..58a1bb1 100644
--- a/features/org.eclipse.ocl-feature/feature.xml
+++ b/features/org.eclipse.ocl-feature/feature.xml
@@ -23,7 +23,9 @@
    <requires>

       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ocl" version="3.0.0" match="compatible"/>

-      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>

+      <import plugin="com.ibm.icu"/>

    </requires>

 

    <plugin

diff --git a/features/org.eclipse.ocl.doc-feature/feature.xml b/features/org.eclipse.ocl.doc-feature/feature.xml
index 3723f37..2cbcec9 100644
--- a/features/org.eclipse.ocl.doc-feature/feature.xml
+++ b/features/org.eclipse.ocl.doc-feature/feature.xml
@@ -1,38 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ocl.doc"
-      label="%featureName"
-      version="3.1.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.ocl.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description url="http://www.eclipse.org/modeling/mdt/ocl">
-      %description
-   </description>
-
-   <copyright>
-      [Documentation] Copyright text will be taken from the shared license feature
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ocl.doc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.ocl.doc"

+      label="%featureName"

+      version="3.1.0.qualifier"

+      provider-name="%providerName"

+      license-feature="org.eclipse.ocl.license"

+      license-feature-version="1.0.0.qualifier">

+

+   <description url="http://www.eclipse.org/modeling/mdt/ocl">

+      %description

+   </description>

+

+   <copyright>

+      [Documentation] Copyright text will be taken from the shared license feature

+   </copyright>

+

+   <url>

+      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+   </url>

+

+   <requires>

+      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.ocl.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/org.eclipse.ocl.examples-feature/feature.xml b/features/org.eclipse.ocl.examples-feature/feature.xml
index ddafc96..25c9f9b 100644
--- a/features/org.eclipse.ocl.examples-feature/feature.xml
+++ b/features/org.eclipse.ocl.examples-feature/feature.xml
@@ -27,6 +27,7 @@
    <requires>

       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>

+      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ui.console" version="3.1.0" match="compatible"/>

       <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.ecore" version="3.0.0" match="compatible"/>

@@ -49,10 +50,10 @@
       <import plugin="org.eclipse.ocl.examples.xtext.essentialocl" version="3.1.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.completeocl" version="3.1.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.oclinecore.ui" version="3.1.0" match="compatible"/>

-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.xtext.builder" version="2.0.0" match="compatible"/>

       <import plugin="org.eclipse.xtext.ui" version="2.0.0" match="compatible"/>

       <import plugin="org.eclipse.xtext.ui.shared" version="2.0.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.xtext.markup.ui" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.oclinecore" version="3.1.0" match="compatible"/>

       <import plugin="org.eclipse.jdt.core" version="3.7.0" match="compatible"/>

       <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>

@@ -72,10 +73,10 @@
       <import plugin="org.eclipse.ui.forms" version="3.5.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.essentialocl.ui" version="3.1.0" match="compatible"/>

       <import plugin="org.eclipse.emf.ecore.editor" version="2.5.0" match="compatible"/>

-      <import plugin="org.eclipse.ocl.examples.xtext.markup.ui" version="3.2.0" match="compatible"/>

-      <import plugin="org.eclipse.uml2.uml" version="4.0.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.essentialocl" version="3.2.0" match="compatible"/>

       <import plugin="org.eclipse.ocl.examples.xtext.markup" version="3.2.0" match="compatible"/>

+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.modelregistry.editor" version="3.0.0" match="compatible"/>

    </requires>

 

    <plugin

diff --git a/features/org.eclipse.ocl.tests-feature/feature.xml b/features/org.eclipse.ocl.tests-feature/feature.xml
index 0d97991..4d9f909 100644
--- a/features/org.eclipse.ocl.tests-feature/feature.xml
+++ b/features/org.eclipse.ocl.tests-feature/feature.xml
@@ -1,121 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ocl.tests"
-      label="%featureName"
-      version="3.1.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.ocl.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description url="http://www.eclipse.org/modeling/mdt/ocl">
-      %description
-   </description>
-
-   <copyright>
-      [Documentation] Copyright text will be taken from the shared license feature
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.junit4" version="4.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ocl.ecore" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ocl.uml" version="3.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ant.optional.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ocl.ecore.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.uml.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.eventmanager.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.testutils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.impactanalyzer.testmodel.company"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.impactanalyzer.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.impactanalyzer.testutils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl.examples.xtext.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.ocl.tests"

+      label="%featureName"

+      version="3.1.0.qualifier"

+      provider-name="%providerName"

+      license-feature="org.eclipse.ocl.license"

+      license-feature-version="1.0.0.qualifier">

+

+   <description url="http://www.eclipse.org/modeling/mdt/ocl">

+      %description

+   </description>

+

+   <copyright>

+      [Documentation] Copyright text will be taken from the shared license feature

+   </copyright>

+

+   <url>

+      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+   </url>

+

+   <requires>

+      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>

+      <import plugin="org.junit4" version="4.5.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>

+      <import plugin="org.apache.ant"/>

+      <import plugin="org.junit"/>

+      <import plugin="org.eclipse.ui"/>

+      <import plugin="org.eclipse.ui.ide.application"/>

+      <import plugin="org.eclipse.equinox.app"/>

+      <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>

+      <import plugin="org.eclipse.ocl.ecore" version="3.1.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.tests" version="3.1.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.examples.library" version="2.5.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.uml" version="4.0.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.tests" version="3.0.0" match="compatible"/>

+      <import plugin="org.eclipse.uml2.uml.resources" version="4.0.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl" version="3.0.0" match="compatible"/>

+      <import plugin="org.eclipse.core.resources" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.jface.text" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.ui.editors" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.modelregistry" version="3.0.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.common" version="3.0.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore"/>

+      <import plugin="org.eclipse.ocl.examples.eventmanager"/>

+      <import plugin="org.junit" version="4.5.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.impactanalyzer.util"/>

+      <import plugin="org.eclipse.ocl.examples.impactanalyzer"/>

+      <import plugin="org.eclipse.emf.compare"/>

+      <import plugin="org.eclipse.emf.compare.diff"/>

+      <import plugin="org.eclipse.emf.compare.match"/>

+      <import plugin="org.eclipse.ocl.examples.xtext.completeocl" version="3.1.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.xtext.oclinecore" version="3.1.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.xtext.oclstdlib" version="3.1.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl.examples.xtext.markup" version="3.2.0" match="compatible"/>

+      <import plugin="org.eclipse.uml2.uml" version="4.0.0" match="compatible"/>

+      <import plugin="org.apache.log4j"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.test"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.ant.optional.junit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         fragment="true"/>

+

+   <plugin

+         id="org.eclipse.ocl.ecore.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.uml.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.eventmanager.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.testutils"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.impactanalyzer.testmodel.company"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.impactanalyzer.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.impactanalyzer.testutils"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.examples.xtext.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/org.eclipse.ocl.uml-feature/feature.xml b/features/org.eclipse.ocl.uml-feature/feature.xml
index 2b0dac1..519e50f 100644
--- a/features/org.eclipse.ocl.uml-feature/feature.xml
+++ b/features/org.eclipse.ocl.uml-feature/feature.xml
@@ -1,51 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ocl.uml"
-      label="%featureName"
-      version="4.0.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.ocl.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description url="http://www.eclipse.org/modeling/mdt/ocl">
-      %description
-   </description>
-
-   <copyright>
-      [Documentation] Copyright text will be taken from the shared license feature
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ocl" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
-      <import plugin="org.eclipse.uml2.uml" version="3.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="lpg.runtime.java"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ocl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-   <plugin
-         id="org.eclipse.ocl.uml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.ocl.uml"

+      label="%featureName"

+      version="4.0.0.qualifier"

+      provider-name="%providerName"

+      license-feature="org.eclipse.ocl.license"

+      license-feature-version="1.0.0.qualifier">

+

+   <description url="http://www.eclipse.org/modeling/mdt/ocl">

+      %description

+   </description>

+

+   <copyright>

+      [Documentation] Copyright text will be taken from the shared license feature

+   </copyright>

+

+   <url>

+      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates"/>

+   </url>

+

+   <requires>

+      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>

+      <import plugin="org.eclipse.ocl" version="3.0.0" match="compatible"/>

+      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>

+      <import plugin="lpg.runtime.java" version="2.0.17" match="compatible"/>

+      <import plugin="com.ibm.icu"/>

+      <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>

+      <import plugin="org.eclipse.uml2.uml" version="4.0.0" match="compatible"/>

+   </requires>

+

+   <plugin

+         id="lpg.runtime.java"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.ocl.uml"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>