Fix feature project description

ipa320 · Sep 29, 2023 · 4285936 · 4285936
1 parent 6c69852
commit 4285936
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 53 deletions.
diff --git a/plugins/de.fraunhofer.ipa.ros.feature/feature.xml b/plugins/de.fraunhofer.ipa.ros.feature/feature.xml
@@ -54,57 +54,14 @@ POSSIBILITY OF SUCH DAMAGE.
    </url>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="de.fraunhofer.ipa.ros"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="de.fraunhofer.ipa.rossystem.xtext"/>
       <import plugin="de.fraunhofer.ipa.rossystem"/>
-      <import plugin="org.eclipse.xtext.ide"/>
-      <import plugin="org.eclipse.xtext.xbase.ide"/>
-      <import plugin="org.antlr.runtime" match="perfect"/>
-      <import plugin="org.eclipse.emf.edit"/>
       <import plugin="de.fraunhofer.ipa.ros.edit"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.sirius"/>
-      <import plugin="org.eclipse.sirius.common.acceleo.aql"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.ui.ide" version="3.13.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.sirius.common"/>
-      <import plugin="org.eclipse.sirius.diagram.ui"/>
       <import plugin="de.fraunhofer.ipa.ros.xtext"/>
       <import plugin="de.fraunhofer.ipa.ros.xtext.ide"/>
-      <import plugin="org.eclipse.xtext.ui"/>
-      <import plugin="org.eclipse.xtext.ui.shared"/>
-      <import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.xtext.builder"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.log4j"/>
-      <import plugin="org.eclipse.xtext"/>
-      <import plugin="org.eclipse.xtext.xbase"/>
-      <import plugin="org.eclipse.equinox.common" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.debug.ui"/>
       <import plugin="de.fraunhofer.ipa.rossystem.edit"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.equinox.registry"/>
-      <import plugin="org.eclipse.emf.transaction"/>
-      <import plugin="org.eclipse.sirius.ui"/>
       <import plugin="de.fraunhofer.ipa.rossystem.xtext.ide"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="com.google.inject"/>
-      <import plugin="org.eclipse.core.commands"/>
-      <import plugin="org.eclipse.emf.common.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="javax.inject"/>
-      <import plugin="org.eclipse.sirius.diagram"/>
    </requires>
 
    <plugin
@@ -198,13 +155,6 @@ POSSIBILITY OF SUCH DAMAGE.
          version="3.0.0.qualifier"
          unpack="false"/>
 
-   <plugin
-         id="de.fraunhofer.ipa.roscode.generator"
-         download-size="0"
-         install-size="0"
-         version="3.0.0.qualifier"
-         unpack="false"/>
-
    <plugin
          id="de.fraunhofer.ipa.ros1.xtext"
          download-size="0"
@@ -251,7 +201,7 @@ POSSIBILITY OF SUCH DAMAGE.
          id="de.fraunhofer.ipa.ros.xtext.tests"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/plugins/de.fraunhofer.ipa.ros.feature/pom.xml b/plugins/de.fraunhofer.ipa.ros.feature/pom.xml
@@ -9,4 +9,16 @@
     </parent>
     <artifactId>de.fraunhofer.ipa.ros.feature</artifactId>
     <packaging>eclipse-feature</packaging>
+
+
+  <properties>
+        <xtextVersion>2.30.0</xtextVersion>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <!-- Tycho settings -->
+        <tycho-version>2.7.4</tycho-version>
+        <tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
+        <mwe2Version>2.14.0</mwe2Version>
+    </properties>
 </project>
diff --git a/plugins/de.fraunhofer.ipa.ros.parent/pom.xml b/plugins/de.fraunhofer.ipa.ros.parent/pom.xml
@@ -34,7 +34,7 @@
         <!--module>../de.fraunhofer.ipa.ros.model.spec.check</module-->
         <!--module>../de.fraunhofer.ipa.roscode.generator</module-->
         <!--module>../de.fraunhofer.ipa.ros.observer.generator</module-->
-        <module>../de.fraunhofer.ipa.ros.xtext.tests</module>
+        <!--module>../de.fraunhofer.ipa.ros.xtext.tests</module-->
 
         <module>../de.fraunhofer.ipa.rossystem</module>
         <module>../de.fraunhofer.ipa.rossystem.xtext</module>
@@ -47,7 +47,7 @@
 
         <module>../de.fraunhofer.ipa.ros.plugin</module>
         <!--module>../de.fraunhofer.ipa.ros.sirius</module-->
-        <!--module>../de.fraunhofer.ipa.ros.feature</module-->
+        <module>../de.fraunhofer.ipa.ros.feature</module>
     </modules>