Changed FMIL core and fragments logic to properly find files

[simantics/fmil.git] / org.simantics.fmil.parent / pom.xml

diff --git a/org.simantics.fmil.parent/pom.xml b/org.simantics.fmil.parent/pom.xml
index d2cc399ba1b6cc057b86e9654adbaf7ba956e9e2..7790ee1c093362665a519048c0c9a08af95b7737 100644 (file)
--- a/org.simantics.fmil.parent/pom.xml
+++ b/org.simantics.fmil.parent/pom.xml
@@ -1,79 +1,84 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <groupId>org.simantics.fmi</groupId>\r
-       <artifactId>org.simantics.fmil.parent</artifactId>\r
-       <version>0.0.1-SNAPSHOT</version>\r
-       <packaging>pom</packaging>\r
-\r
-       <!-- common settings for all modules -->\r
-       <properties>\r
-               <branch-spec>master</branch-spec>\r
-               <simantics-download-site>http://www.simantics.org/download</simantics-download-site>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <tycho-version>1.0.0</tycho-version>\r
-       </properties>\r
-\r
-       <repositories>\r
-               <!-- configure p2 repository to resolve against -->\r
-               <repository>\r
-                       <id>simantics-sdk</id>\r
-                       <layout>p2</layout>\r
-                       <url>${simantics-download-site}/${branch-spec}/sdk</url>\r
-               </repository>\r
-       </repositories>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>tycho-compiler-plugin</artifactId>\r
-                               <version>${tycho-version}</version>\r
-                               <configuration>\r
-                                       <compilerArgument>-err:-forbidden</compilerArgument>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>tycho-maven-plugin</artifactId>\r
-                               <version>${tycho-version}</version>\r
-                               <extensions>true</extensions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>tycho-versions-plugin</artifactId>\r
-                               <version>${tycho-version}</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>target-platform-configuration</artifactId>\r
-                               <version>${tycho-version}</version>\r
-                               <configuration>\r
-                                       <ignoreTychoRepositories>true</ignoreTychoRepositories>\r
-                                       <resolver>p2</resolver>\r
-                                       <environments>\r
-                                               <environment>\r
-                                                       <os>win32</os>\r
-                                                       <ws>win32</ws>\r
-                                                       <arch>x86</arch>\r
-                                               </environment>\r
-                                               <environment>\r
-                                                       <os>win32</os>\r
-                                                       <ws>win32</ws>\r
-                                                       <arch>x86_64</arch>\r
-                                               </environment>\r
-                                       </environments>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-\r
-       <modules>\r
-               <module>../org.simantics.fmil.core</module>\r
-               <module>../org.simantics.fmil.feature</module>\r
-               <module>../org.simantics.fmil.linux64</module>\r
-               <module>../org.simantics.fmil.win32</module>\r
-               <module>../org.simantics.fmil.win64</module>\r
-               <module>../org.simantics.fmil.repository</module>\r
-       </modules>\r
-</project>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <groupId>org.simantics.fmi</groupId>
+       <artifactId>org.simantics.fmil.parent</artifactId>
+       <version>0.0.1-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <!-- common settings for all modules -->
+       <properties>
+               <branch-spec>master</branch-spec>
+               <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <tycho-version>1.1.0</tycho-version>
+       </properties>
+
+       <repositories>
+               <!-- configure p2 repository to resolve against -->
+               <repository>
+                       <id>simantics-sdk</id>
+                       <layout>p2</layout>
+                       <url>${simantics-download-site}/${branch-spec}/sdk</url>
+               </repository>
+       </repositories>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-compiler-plugin</artifactId>
+                               <version>${tycho-version}</version>
+                               <configuration>
+                                       <compilerArgument>-err:-forbidden</compilerArgument>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-maven-plugin</artifactId>
+                               <version>${tycho-version}</version>
+                               <extensions>true</extensions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-versions-plugin</artifactId>
+                               <version>${tycho-version}</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>target-platform-configuration</artifactId>
+                               <version>${tycho-version}</version>
+                               <configuration>
+                                       <ignoreTychoRepositories>true</ignoreTychoRepositories>
+                                       <resolver>p2</resolver>
+                                       <environments>
+                                               <environment>
+                                                       <os>linux</os>
+                                                       <ws>gtk</ws>
+                                                       <arch>x86_64</arch>
+                                               </environment>
+                                               <environment>
+                                                       <os>win32</os>
+                                                       <ws>win32</ws>
+                                                       <arch>x86</arch>
+                                               </environment>
+                                               <environment>
+                                                       <os>win32</os>
+                                                       <ws>win32</ws>
+                                                       <arch>x86_64</arch>
+                                               </environment>
+                                       </environments>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+
+       <modules>
+               <module>../org.simantics.fmil.core</module>
+               <module>../org.simantics.fmil.feature</module>
+               <module>../org.simantics.fmil.linux64</module>
+               <module>../org.simantics.fmil.win32</module>
+               <module>../org.simantics.fmil.win64</module>
+               <module>../org.simantics.fmil.repository</module>
+       </modules>
+</project>