Skip to content

Commit

Permalink
restructure maven projects strunture and adapt setup file
Browse files Browse the repository at this point in the history
  • Loading branch information
ipa-nhg committed Jul 19, 2019
1 parent f438228 commit 94ba71b
Show file tree
Hide file tree
Showing 31 changed files with 81 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
install: true
script: mvn clean verify -f plugins/pom.xml
script: mvn clean verify -f plugins/de.fraunhofer.ipa.ros.parent/pom.xml
cache:
directories:
- $HOME/.m2
6 changes: 3 additions & 3 deletions EclipseInstaller/ROSModel.setup
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@
<requirement
name="*"/>
<sourceLocator
rootFolder="${ros-model.location}"
locateNestedProjects="true">
<excludedPath>examples</excludedPath>
rootFolder="${ros-model.location}/plugins/"
locateNestedProjects="false">
<excludedPath>.</excludedPath>
</sourceLocator>
</targlet>
<implicitDependency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Run ROS Tooling"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.componentInterface.edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.edit</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.componentInterface.editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.editor</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.xtext.ide</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -28,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.xtext.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.xtext.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -29,4 +30,4 @@
</plugins>
</build>

</project>
</project>
1 change: 1 addition & 0 deletions plugins/de.fraunhofer.ipa.componentInterface.xtext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface.xtext</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.componentInterface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.componentInterface</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.edit</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.editor</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.model.spec.check/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.model.spec.check</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -28,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>plugins</name>
<name>de.fraunhofer.ipa.ros.parent</name>
<comment></comment>
<projects>
</projects>
Expand Down
52 changes: 26 additions & 26 deletions plugins/pom.xml → plugins/de.fraunhofer.ipa.ros.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,36 @@
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
</properties>
<modules>
<module>de.fraunhofer.ipa.ros</module>
<module>de.fraunhofer.ipa.ros.xtext</module>
<module>de.fraunhofer.ipa.ros.xtext.ide</module>
<module>de.fraunhofer.ipa.ros.xtext.ui</module>
<module>de.fraunhofer.ipa.ros.edit</module>
<module>de.fraunhofer.ipa.ros.editor</module>
<module>de.fraunhofer.ipa.ros.model.spec.check</module>
<module>de.fraunhofer.ipa.roscode.generator</module>
<module>de.fraunhofer.ipa.ros.xtext.tests</module>
<module>../de.fraunhofer.ipa.ros</module>
<module>../de.fraunhofer.ipa.ros.xtext</module>
<module>../de.fraunhofer.ipa.ros.xtext.ide</module>
<module>../de.fraunhofer.ipa.ros.xtext.ui</module>
<module>../de.fraunhofer.ipa.ros.edit</module>
<module>../de.fraunhofer.ipa.ros.editor</module>
<module>../de.fraunhofer.ipa.ros.model.spec.check</module>
<module>../de.fraunhofer.ipa.roscode.generator</module>
<module>../de.fraunhofer.ipa.ros.xtext.tests</module>


<module>de.fraunhofer.ipa.componentInterface</module>
<module>de.fraunhofer.ipa.componentInterface.xtext</module>
<module>de.fraunhofer.ipa.componentInterface.xtext.ide</module>
<module>de.fraunhofer.ipa.componentInterface.xtext.ui</module>
<module>de.fraunhofer.ipa.componentInterface.edit</module>
<module>de.fraunhofer.ipa.componentInterface.editor</module>
<module>de.fraunhofer.ipa.componentInterface.xtext.tests</module>
<module>../de.fraunhofer.ipa.componentInterface</module>
<module>../de.fraunhofer.ipa.componentInterface.xtext</module>
<module>../de.fraunhofer.ipa.componentInterface.xtext.ide</module>
<module>../de.fraunhofer.ipa.componentInterface.xtext.ui</module>
<module>../de.fraunhofer.ipa.componentInterface.edit</module>
<module>../de.fraunhofer.ipa.componentInterface.editor</module>
<module>../de.fraunhofer.ipa.componentInterface.xtext.tests</module>

<module>de.fraunhofer.ipa.rossystem</module>
<module>de.fraunhofer.ipa.rossystem.xtext</module>
<module>de.fraunhofer.ipa.rossystem.xtext.ide</module>
<module>de.fraunhofer.ipa.rossystem.xtext.ui</module>
<module>de.fraunhofer.ipa.rossystem.edit</module>
<module>de.fraunhofer.ipa.rossystem.editor</module>
<module>de.fraunhofer.ipa.rossystem.xtext.tests</module>
<module>../de.fraunhofer.ipa.rossystem</module>
<module>../de.fraunhofer.ipa.rossystem.xtext</module>
<module>../de.fraunhofer.ipa.rossystem.xtext.ide</module>
<module>../de.fraunhofer.ipa.rossystem.xtext.ui</module>
<module>../de.fraunhofer.ipa.rossystem.edit</module>
<module>../de.fraunhofer.ipa.rossystem.editor</module>
<module>../de.fraunhofer.ipa.rossystem.xtext.tests</module>

<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.plugin</module>
<module>../de.fraunhofer.ipa.ros.sirius</module>
<module>../de.fraunhofer.ipa.ros.feature</module>
</modules>

<repositories>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.plugin</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.sirius/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.sirius</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
1 change: 1 addition & 0 deletions plugins/de.fraunhofer.ipa.ros.xtext.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.xtext.ide</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
1 change: 1 addition & 0 deletions plugins/de.fraunhofer.ipa.ros.xtext.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.xtext.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.xtext.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.xtext.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -29,4 +30,4 @@
</plugins>
</build>

</project>
</project>
1 change: 1 addition & 0 deletions plugins/de.fraunhofer.ipa.ros.xtext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros.xtext</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.ros/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.ros</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.roscode.generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.roscode.generator</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -27,4 +28,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.rossystem.edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.rossystem.edit</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.rossystem.editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.rossystem.editor</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
</project>
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.rossystem.xtext.ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.rossystem.xtext.ide</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -28,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
1 change: 1 addition & 0 deletions plugins/de.fraunhofer.ipa.rossystem.xtext.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.rossystem.xtext.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
3 changes: 2 additions & 1 deletion plugins/de.fraunhofer.ipa.rossystem.xtext.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<groupId>de.fraunhofer.ipa.ros</groupId>
<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
</parent>
<artifactId>de.fraunhofer.ipa.rossystem.xtext.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -28,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Loading

0 comments on commit 94ba71b

Please sign in to comment.