update tycho plugin and remove snapshot repo informations
and update submodules to 4.2.0_R14
Change-Id: Icfefb4749766fa4afd636f809609726918d2614d
Reviewed-on: https://git.eclipse.org/r/51834
Reviewed-by: Stephan Leicht Vogt <stephan.leichtvogt@bsi-software.com>
Tested-by: Stephan Leicht Vogt <stephan.leichtvogt@bsi-software.com>
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 7826628..f0be3dc 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -71,9 +71,9 @@
<scout.version>4.2.0-SNAPSHOT</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
- <tycho.version>0.20.0</tycho.version>
- <tycho-extras.version>0.20.0</tycho-extras.version>
- <cbi-plugins.version>1.0.5</cbi-plugins.version>
+ <tycho.version>0.22.0</tycho.version>
+ <tycho-extras.version>0.22.0</tycho-extras.version>
+ <cbi-plugins.version>1.1.2</cbi-plugins.version>
<jarsigner.version>1.1.2</jarsigner.version>
<compileSource>1.6</compileSource>
@@ -84,9 +84,6 @@
<rap-repo-target-platform>eclipse-staging</rap-repo-target-platform>
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
- <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
- <cbi-jdt-version>3.10.0.v20140604-1726</cbi-jdt-version>
- <cbi-snapshots-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-snapshots-repo.url>
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
<!-- UI-Test (Tycho-Tests) Arguments -->
@@ -115,17 +112,6 @@
</pluginRepository>
<pluginRepository>
- <id>cbi-snapshots</id>
- <url>${cbi-snapshots-repo.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
<id>eclipse</id>
<url>${eclipse-repo.url}</url>
<releases>
@@ -135,17 +121,6 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
-
- <pluginRepository>
- <id>cbi-jdt</id>
- <url>${cbi-jdt-repo.url}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
<build>
@@ -261,13 +236,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${cbi-jdt-version}</version>
- </dependency>
- </dependencies>
<configuration>
<source>${compileSource}</source>
<encoding>${project.build.sourceEncoding}</encoding>
@@ -366,8 +334,8 @@
<!-- Kill test JVM if tests take more than 5 minutes (300 seconds) to finish -->
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<!-- do not abort on test failures -->
- <failIfNoTests>false</failIfNoTests>
- <testFailureIgnore>true</testFailureIgnore>
+ <failIfNoTests>false</failIfNoTests>
+ <testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index 2d858de..6fe1314 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit 2d858de7041ea41c000d1cdd6b4ce53c16eca8c7
+Subproject commit 6fe131491c54f2396c1fc1b77652530e8edfca8f
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
index 9be1893..3dd0f2c 160000
--- a/org.eclipse.scout.rt.incubator
+++ b/org.eclipse.scout.rt.incubator
@@ -1 +1 @@
-Subproject commit 9be1893653e2ff7d88389c623fde502a5234472d
+Subproject commit 3dd0f2cb1d3ad7811e450370d50f6721838ea94f
diff --git a/org.eclipse.scout.rt.rap.target/pom.xml b/org.eclipse.scout.rt.rap.target/pom.xml
index b3e8b92..f0918b6 100644
--- a/org.eclipse.scout.rt.rap.target/pom.xml
+++ b/org.eclipse.scout.rt.rap.target/pom.xml
@@ -79,7 +79,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6.1</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -110,7 +110,7 @@
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>target-platform-utils</artifactId>
- <version>0.16.0.CR2</version>
+ <version>0.22.0</version>
<executions>
<execution>
<id>create-mirror-repo</id>
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 2f2b768..29f58fc 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 2f2b76836c4de8e04d7bc1b434a13d0cb844c2b9
+Subproject commit 29f58fc58b48650bce631e93bdb822b778075485
