Merge branch 'releases/4.0.x' into develop
Conflicts:
org.eclipse.scout.rt
org.eclipse.scout.rt.incubator
org.eclipse.scout.sdk
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 6828044..bd90ea2 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -368,6 +368,9 @@
</excludes>
<!-- 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>
</configuration>
</plugin>
diff --git a/org.eclipse.scout.rt.rap.target/.project b/org.eclipse.scout.rt.rap.target/.project
index ac86c91..3758342 100644
--- a/org.eclipse.scout.rt.rap.target/.project
+++ b/org.eclipse.scout.rt.rap.target/.project
@@ -27,7 +27,6 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
