From 016b37df967f056cdbbcbedd3be7b0d8d75cf352 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 7 Jun 2017 12:21:08 +0300
Subject: [PATCH] Take Tycho 1.0.0 into use.

Set useProjectSettings=false to keep backwards compliant.

refs #7288

Change-Id: I3b1735cb27676baae89549a4e4281e6003f5bbf7
---
 .mvn/extensions.xml                              |  2 +-
 bundles/org.simantics.gnuplot/pom.xml            |  6 +++---
 bundles/pom.xml                                  |  1 +
 releng/org.simantics.tycho.configuration/pom.xml | 11 ++---------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index bbf5bfcee..1bf00d24c 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>0.26.0</version>
+    <version>1.0.0</version>
   </extension>
 </extensions> 
\ No newline at end of file
diff --git a/bundles/org.simantics.gnuplot/pom.xml b/bundles/org.simantics.gnuplot/pom.xml
index 34a454c19..75ed6fe45 100644
--- a/bundles/org.simantics.gnuplot/pom.xml
+++ b/bundles/org.simantics.gnuplot/pom.xml
@@ -18,7 +18,7 @@
 	<!-- common settings for all modules -->
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>0.26.0</tycho-version>
+		<tycho-version>1.0.0</tycho-version>
 	</properties>
 
 	<build>
@@ -76,7 +76,7 @@
 											tycho-packaging-plugin
 										</artifactId>
 										<versionRange>
-											[0.24.0,)
+											[1.0.0,)
 										</versionRange>
 										<goals>
 											<goal>validate-id</goal>
@@ -99,7 +99,7 @@
 											tycho-compiler-plugin
 										</artifactId>
 										<versionRange>
-											[0.24.0,)
+											[1.0.0,)
 										</versionRange>
 										<goals>
 											<goal>compile</goal>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index bc89d553c..560f55592 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -31,6 +31,7 @@
 				<version>${tycho.version}</version>
 				<configuration>
 					<compilerArgument>-err:-forbidden</compilerArgument>
+					<useProjectSettings>false</useProjectSettings>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 49839a912..66070b623 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -8,20 +8,13 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho.version>0.26.0</tycho.version>
-		<tycho.extras.version>0.26.0</tycho.extras.version>
+		<tycho.version>1.0.0</tycho.version>
+		<tycho.extras.version>1.0.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
 	</properties>
 
 	<repositories>
-		<!--
-		<repository>
-			<id>mars</id>
-			<url>${mars-repo.url}</url>
-			<layout>p2</layout>
-		</repository>
-		-->
 	</repositories>
 
 	<pluginRepositories>
-- 
2.43.2