Bug 568001 - Scout publishing old/expired dependencies to simrel

- Remove dependency to org.apache.commons.lang3 as it is no longer used
- Load javax.wsdl, com.google.gson & com.google.guava from orbit instead
  of simrel repo to avoid consuming and re-publishing old p2 content
- Align guava version from Maven with the one from P2 (used by m2e)

Note: guava and gson are indirectly required by m2e only.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=568001

8 files changed, 23 insertions, 24 deletions

diff --git a/org.eclipse.scout.sdk-repository/category.xml b/org.eclipse.scout.sdk-repository/category.xml
index 2388d1099..3eb61fd1e 100644
--- a/org.eclipse.scout.sdk-repository/category.xml
+++ b/org.eclipse.scout.sdk-repository/category.xml
@@ -25,5 +25,4 @@
    </category-def>
 
    <bundle id="javax.wsdl"/> <!-- Embed the dependency additionally in the P2 update site (via WTP otherwise) -->
-   <bundle id="org.apache.commons.lang3"/> <!-- Embed the dependency additionally in the P2 update site (via WTP otherwise) -->
 </site>
diff --git a/org.eclipse.scout.sdk-target/org.eclipse.2020-03-dependencies.target b/org.eclipse.scout.sdk-target/org.eclipse.2020-03-dependencies.target
index 9180867f7..e6f9bf80d 100644
--- a/org.eclipse.scout.sdk-target/org.eclipse.2020-03-dependencies.target
+++ b/org.eclipse.scout.sdk-target/org.eclipse.2020-03-dependencies.target
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Scout SDK Eclipse 2020-03 Dependencies" sequenceNumber="45">
+<?pde version="3.8"?><target name="Scout SDK Eclipse 2020-03 Dependencies" sequenceNumber="46">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-<unit id="com.google.guava" version="0.0.0"/>
-<unit id="javax.wsdl" version="0.0.0"/>
-<unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
@@ -32,6 +27,12 @@
 <repository location="http://download.eclipse.org/releases/2020-03/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="com.google.gson" version="2.2.4.v201311231704"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
diff --git a/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml b/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml
index 4211205c0..132d53ed6 100644
--- a/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml
+++ b/org.eclipse.scout.sdk.core.s.test/org.eclipse.scout.sdk.core.s.test.iml
@@ -46,10 +46,10 @@
     <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: com.google.inject:guice:no_aop:4.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:28.1-jre" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4" level="project" />
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom
index dcd1f5065..9a0e93eb3 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.m2e.core.pom
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>[21,22)</version>
+      <version>[27.1,28)</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml b/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml
index 906874660..1a0a08a11 100644
--- a/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml
+++ b/org.eclipse.scout.sdk.s2e.test/org.eclipse.scout.sdk.s2e.test.iml
@@ -44,10 +44,10 @@
     <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: com.google.inject:guice:no_aop:4.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:28.1-jre" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4" level="project" />
diff --git a/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml b/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml
index 232125751..754f4398b 100644
--- a/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml
+++ b/org.eclipse.scout.sdk.s2e.ui/org.eclipse.scout.sdk.s2e.ui.iml
@@ -107,14 +107,14 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.platform:org.eclipse.core.filebuffers:3.6.900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.core.ui:1.15.0.20200310-1900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.core:1.15.0.20200310-1900" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:28.1-jre" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.18" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.archetype.common:1.15.0.20200310-1900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:3.114.0" level="project" />
diff --git a/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml b/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml
index ab33a8fb5..62d033d94 100644
--- a/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml
+++ b/org.eclipse.scout.sdk.s2e/org.eclipse.scout.sdk.s2e.iml
@@ -37,14 +37,14 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.platform:org.eclipse.core.filebuffers:3.6.900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.core:1.15.0.20200310-1900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:28.1-jre" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.18" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.scout.sdk.deps:org.eclipse.m2e.archetype.common:1.15.0.20200310-1900" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.archetype:archetype-catalog:2.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.0.21" level="project" />
diff --git a/org.eclipse.scout.sdk/pom.xml b/org.eclipse.scout.sdk/pom.xml
index 76780aa17..b4f39a6dc 100644
--- a/org.eclipse.scout.sdk/pom.xml
+++ b/org.eclipse.scout.sdk/pom.xml
@@ -54,7 +54,6 @@
     <master_test_forkCount>1</master_test_forkCount>
     <master_test_timeout>18000</master_test_timeout> <!-- 5 hours -->
     <master_test_forkCount>1</master_test_forkCount>
-    <master_unitTest_failureIgnore>false</master_unitTest_failureIgnore>
     <eclipse_gerrit_username/>
 
     <!-- Sonar properties -->
@@ -899,7 +898,7 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <scope>test</scope>
-        <version>28.1-jre</version>
+        <version>27.1-jre</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>