X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.fmil.parent%2Fpom.xml;h=7790ee1c093362665a519048c0c9a08af95b7737;hb=b74cf2632ea8a42163add129b4fe8ec36a4f39d1;hp=d2cc399ba1b6cc057b86e9654adbaf7ba956e9e2;hpb=a5066bf1deec1505c41457cdf06694344aa9f41a;p=simantics%2Ffmil.git

diff --git a/org.simantics.fmil.parent/pom.xml b/org.simantics.fmil.parent/pom.xml
index d2cc399..7790ee1 100644
--- 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"
-	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.0.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>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>
+<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>