Bug 512022 - [Papyrus] [oxygen] Creation of a new Git/Gerrit repository org.eclipse.papyrus-requirements.git

- Archived the plugins moved to the new repository
- Corrected the merge conflict

Change-Id: I8dfffd72c0d8127348821c518307955d19e3b245
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

2 files changed, 0 insertions, 60 deletions

diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 0e70c03b0d4..9f2192b0506 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -91,54 +91,6 @@
 
 		<module>../../extraplugins/revision/org.eclipse.papyrus.revisiontool</module>
 		<module>../../extraplugins/spem2/org.eclipse.papyrus.spem2.profile</module>
-		
-		<!-- Papyrus for Measurement (a.k.a Papyrus Metrics) -->
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.commands</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.extensionpoints</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.handlers</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.smm</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.ui</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.view</module>
-		<module>../../extraplugins/metrics/org.eclipse.papyrus.metrics.viewers</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.metrics.feature</module>
-
-		<!-- Papyrus 4 Requirements (a.k.a. Papyrus Req)-->
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.common</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.common.ui</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.export</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.languagecreationtools.commands</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.languagecreationtools.domainModel2Profile</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.languagecreationtools.handlers</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.languagecreationtools.ui</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.preferences</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.reqif</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.assistant.commands</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.assistant.handlers</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.assistant.ui</module>        
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.common</module>      
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.testers</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.traceability.assistant</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.traceability.commands</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.traceability.handlers</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.traceability.ui</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.common</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.satisfiedBy.config</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.verifiedBy.config</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.derivedFrom.config</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.refinedBy.config</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.matrix.tracedTo.config</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.sysml.verification</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.metrics.library</module>
-		<module>../../extraplugins/requirements/org.eclipse.papyrus.requirements.templates</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.requirements.feature</module>
-
-		<!-- Papyrus BMM -->
-		<module>../../extraplugins/bmm/org.eclipse.papyrus.bmm</module>
-		<module>../../extraplugins/bmm/org.eclipse.papyrus.bmm.diagram</module>
-		<module>../../extraplugins/bmm/org.eclipse.papyrus.bmm.diagram.common</module>
-		<module>../../extraplugins/bmm/org.eclipse.papyrus.bmm.diagram.ui</module>
-		<module>../../extraplugins/bmm/org.eclipse.papyrus.bmm.examples</module>
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.bmm.extra.feature</module>
 
 		<!-- SysML 1.1 -->
 		<module>../../plugins/sysml</module> <!-- Deprecated component moved to extraplugin for Neon. To be removed in Oxygen -->
diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml
index f631286ade1..5b0d839557e 100644
--- a/releng/extra/site/category.xml
+++ b/releng/extra/site/category.xml
@@ -48,24 +48,12 @@
    <feature url="features/org.eclipse.papyrus.extra.soaml.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.soaml.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.metrics.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.metrics.feature" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.bmm.extra.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.bmm.extra.feature" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.bmm.extra.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.bmm.extra.feature.source" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
    <feature url="features/org.eclipse.papyrus.revisiontool.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.revisiontool.feature.source" version="0.7.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.revisiontool.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.revisiontool.feature" version="0.7.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.requirements.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.requirements.feature" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
    <feature url="features/org.eclipse.papyrus.sysml.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml.feature" version="2.0.0.qualifier">
       <category name="org.eclipse.papyrus.category.sysml11"/>
    </feature>