Take Tycho 1.0.0 into use.

Set useProjectSettings=false to keep backwards compliant.

refs #7288

Change-Id: I3b1735cb27676baae89549a4e4281e6003f5bbf7

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index bbf5bfcee04298bd7174cb66ccd19d895da30ab0..1bf00d24c459199b02ec7dcbbda6eb508eab2242 100644 (file)
--- 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 34a454c19a9349cb23de7cf03fc108efe784236a..75ed6fe45f3b62176f9d23635fd09077b44186a9 100644 (file)
--- 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 bc89d553cc37edc4e20dab908884eec8c43d03b2..560f55592291af655b804edd1855d2a5177fa006 100644 (file)
--- 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 49839a912e2fb90643c02fac4f98d22a892817e2..66070b623e3b50c38491ae4842b62849bd30c5bc 100644 (file)
--- 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>