diff --git a/monitor.rest/pom.xml b/monitor.rest/pom.xml
index 27defdb..2beffd5 100644
--- a/monitor.rest/pom.xml
+++ b/monitor.rest/pom.xml
@@ -38,6 +38,32 @@
com.google.code.findbugs
jsr305
+
+
+ com.sun.activation
+ javax.activation
+ 1.2.0
+
+
+ javax.annotation
+ javax.annotation-api
+ 1.3.1
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.0
+
diff --git a/monitor.utils/src/main/java/monitor/utils/Utils.java b/monitor.utils/src/main/java/monitor/utils/Utils.java
index 7802f1f..25d2047 100644
--- a/monitor.utils/src/main/java/monitor/utils/Utils.java
+++ b/monitor.utils/src/main/java/monitor/utils/Utils.java
@@ -1,8 +1,7 @@
package monitor.utils;
-import sun.misc.BASE64Encoder;
-
import java.util.Arrays;
+import java.util.Base64;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -22,7 +21,7 @@ public static Optional firstPresent(Supplier>... optionals) {
}
public static String toBase64(String content) {
- return new BASE64Encoder().encode(content.getBytes());
+ return Base64.getEncoder().encodeToString(content.getBytes());
}
}
diff --git a/monitor/src/main/java/monitor/Main.java b/monitor/src/main/java/monitor/Main.java
index 197c553..0262fee 100644
--- a/monitor/src/main/java/monitor/Main.java
+++ b/monitor/src/main/java/monitor/Main.java
@@ -11,6 +11,7 @@
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executors;
@@ -27,7 +28,7 @@ public class Main {
public static void main(String[] args) {
logClassPathContent();
- Monitor monitor = createMonitor();
+ var monitor = createMonitor();
MonitorServer server = MonitorServer
.create(monitor::currentStatistics)
.start();
@@ -43,9 +44,8 @@ public static void main(String[] args) {
}
private static void logClassPathContent() {
- URLClassLoader classLoader = (URLClassLoader) Main.class.getClassLoader();
- String message = stream(classLoader.getURLs())
- .map(URL::toString)
+ String[] classPath = System.getProperty("java.class.path").split(":");
+ String message = Arrays.stream(classPath)
.map(url -> "\t" + url)
.collect(joining("\n", "Class path content:\n", "\n"));
System.out.println(message);
diff --git a/pom.xml b/pom.xml
index 6dad25f..8d14fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
org.mockito
mockito-core
- 2.2.1
+ 2.18.3
org.assertj
@@ -74,7 +74,7 @@
maven-compiler-plugin
- 3.7.0
+ 3.8.0
true
@@ -102,4 +102,37 @@
+
+
+ java-9
+
+ 9
+
+
+ 9
+ 9
+
+
+
+ java-10
+
+ 10
+
+
+ 10
+ 10
+
+
+
+ java-11
+
+ 11
+
+
+ 11
+ 11
+
+
+
+