Update Java dependencies

3 files changed, 34 insertions, 33 deletions

diff --git a/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml b/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml
index d4c3d68814..ac5190dfa5 100644
--- a/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml
+++ b/org.eclipse.scout.rt.shared.test/org.eclipse.scout.rt.shared.test.iml
@@ -14,15 +14,15 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="org.eclipse.scout.rt.shared" />
     <orderEntry type="module" module-name="org.eclipse.scout.rt.platform" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.1.Final" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
     <orderEntry type="module" module-name="org.eclipse.scout.rt.security" />
     <orderEntry type="module" module-name="org.eclipse.scout.rt.dataobject" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.34.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-apache-v2:1.36.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.36.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
@@ -31,18 +31,19 @@
     <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" />
     <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.22.1" level="project" />
     <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="module" module-name="org.eclipse.scout.rt.platform.test" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java
index 286b7b2391..652edec13d 100644
--- a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java
+++ b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.scout.rt.platform.util.CollectionUtility;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType3;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType4;
 import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,25 +42,25 @@ public class CodeServiceTest {
 
   /**
    * Test method for
-   * {@link org.eclipse.scout.rt.shared.services.common.code.CodeService#getAllCodeTypeClasses(java.lang.String)} .
+   * {@link CodeService#getAllCodeTypeClasses()} .
    */
   @Test
   public void testGetAllCodeTypeClasses() {
     ICodeService service = newCodeServiceInstance();
     Collection<Class<? extends ICodeType<?, ?>>> codeTypeClasses1 = service.getAllCodeTypeClasses();
     assertEquals("codeTypeClasses1 size", 2, codeTypeClasses1.size());
-    assertEquals("codeTypeClasses1 contains AbcCodeType", true, codeTypeClasses1.contains(AbcCodeType.class));
-    assertEquals("codeTypeClasses1 contains ZyxCodeType", true, codeTypeClasses1.contains(ZyxCodeType.class));
+    assertTrue("codeTypeClasses1 contains AbcCodeType", codeTypeClasses1.contains(AbcCodeType.class));
+    assertTrue("codeTypeClasses1 contains ZyxCodeType", codeTypeClasses1.contains(ZyxCodeType.class));
 
     Collection<Class<? extends ICodeType<?, ?>>> codeTypeClasses2 = service.getAllCodeTypeClasses();
     assertEquals("codeTypeClasses2 size", 1, codeTypeClasses2.size());
-    assertEquals("codeTypeClasses2 contains AbcCodeType", true, codeTypeClasses2.contains(AbcCodeType.class));
-    assertEquals("codeTypeClasses2 contains ZyxCodeType", false, codeTypeClasses2.contains(ZyxCodeType.class));
+    assertTrue("codeTypeClasses2 contains AbcCodeType", codeTypeClasses2.contains(AbcCodeType.class));
+    assertFalse("codeTypeClasses2 contains ZyxCodeType", codeTypeClasses2.contains(ZyxCodeType.class));
   }
 
   /**
    * Test method for
-   * {@link org.eclipse.scout.rt.shared.services.common.code.CodeService#getAllCodeTypes(java.lang.String)} .
+   * {@link CodeService#getAllCodeTypes()} .
    */
   @Test
   public void testGetAllCodeTypesString() {
@@ -211,28 +212,28 @@ public class CodeServiceTest {
   public void testReplaceLookupUsingCodeService() {
     ICodeService service = newCodeServiceInstance();
 
-    assertThat(service.getCodeType(TestCodeType3.class), instanceOf(TestCodeType4.class));
-    assertThat(service.getCodeType(TestCodeType4.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(service.getCodeType(TestCodeType3.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(service.getCodeType(TestCodeType4.class), instanceOf(TestCodeType4.class));
   }
 
   @Test
   public void testReplaceCodeServiceGetCodeTypes() {
     ICodeService service = newCodeServiceInstance();
 
-    List<ICodeType<?, ?>> codeTypes = service.getCodeTypes(Arrays.<Class<? extends ICodeType<?, ?>>> asList(TestCodeType3.class, TestCodeType4.class));
+    List<ICodeType<?, ?>> codeTypes = service.getCodeTypes(Arrays.asList(TestCodeType3.class, TestCodeType4.class));
     assertEquals(2, codeTypes.size());
-    assertThat(codeTypes.get(0), instanceOf(TestCodeType4.class));
-    assertThat(codeTypes.get(1), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(codeTypes.get(0), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(codeTypes.get(1), instanceOf(TestCodeType4.class));
   }
 
   @Test
   public void testReplaceCodeServiceGetCodeTypeMap() {
     ICodeService service = newCodeServiceInstance();
 
-    Map<Class<? extends ICodeType<?, ?>>, ICodeType<?, ?>> codeTypes = service.getCodeTypeMap(Arrays.<Class<? extends ICodeType<?, ?>>> asList(TestCodeType3.class, TestCodeType4.class));
+    Map<Class<? extends ICodeType<?, ?>>, ICodeType<?, ?>> codeTypes = service.getCodeTypeMap(Arrays.asList(TestCodeType3.class, TestCodeType4.class));
     assertEquals(2, codeTypes.size());
-    assertThat(codeTypes.get(TestCodeType3.class), instanceOf(TestCodeType4.class));
-    assertThat(codeTypes.get(TestCodeType4.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(codeTypes.get(TestCodeType3.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(codeTypes.get(TestCodeType4.class), instanceOf(TestCodeType4.class));
   }
 
   protected ICodeService newCodeServiceInstance() {
diff --git a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java
index 58d70059b0..7888fa33a3 100644
--- a/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java
+++ b/org.eclipse.scout.rt.shared.test/src/test/java/org/eclipse/scout/rt/shared/services/common/code/CodeTypeRegistrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,15 +11,14 @@
 package org.eclipse.scout.rt.shared.services.common.code;
 
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 import org.eclipse.scout.rt.platform.BEANS;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.IgnoredCodeType;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType1;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType3;
 import org.eclipse.scout.rt.shared.services.common.code.fixture.TestCodeType4;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
 /**
@@ -35,8 +34,8 @@ public class CodeTypeRegistrationTest {
 
   @Test
   public void testReplace() {
-    assertThat(BEANS.get(TestCodeType3.class), instanceOf(TestCodeType4.class));
-    assertThat(BEANS.get(TestCodeType4.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(BEANS.get(TestCodeType3.class), instanceOf(TestCodeType4.class));
+    MatcherAssert.assertThat(BEANS.get(TestCodeType4.class), instanceOf(TestCodeType4.class));
   }
 
 }