From a7a8f9822082e533096e5bdecc531cbaea0f3931 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Wed, 10 Apr 2019 17:43:54 +0200
Subject: HONEYCOMB-448: JAVA 11 support

- updated dependencies
- compilation error fixes

Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 infra/minimal-distribution-test/pom.xml                               | 2 +-
 .../honeycomb/infra/distro/activation/ActiveModuleProviderTest.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'infra/minimal-distribution-test')

diff --git a/infra/minimal-distribution-test/pom.xml b/infra/minimal-distribution-test/pom.xml
index c8f207bd7..fe3eea2f5 100644
--- a/infra/minimal-distribution-test/pom.xml
+++ b/infra/minimal-distribution-test/pom.xml
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
index 0a9bd9cdf..970687132 100644
--- a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
+++ b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
@@ -55,13 +55,13 @@ public class ActiveModuleProviderTest {
         assertThat(activeModules, hasItem(isA(Modules.ChildModule3.class)));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testLoadActiveModulesFailed() {
         final ImmutableList rawResources = of(
                 "// this should be skipped",
                 "// io.fd.honeycomb.infra.distro.Modules$ChildModule1",
                 "               io.fd.honeycomb.infra.distro.Modules$ChildModule2",
-                "### io.fd.honeycomb.infra.distro.Modules$ChildModule3     ",// it should fail because of this
+                "io.fd.honeycomb.infra.distro.Modules$ChildModule3     ",// it should fail because of this
                 "io.fd.honeycomb.infra.distro.Modules$ChildModule3",
                 "io.fd.honeycomb.infra.distro.Modules$NonModule"
         );
-- 
cgit 1.2.3-korg