From 9e99d1d7965ed7720b1881873df9973335bf0361 Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Tue, 25 Jul 2017 11:27:27 +0200 Subject: [PATCH 1/3] Migrate to Java 9 --- monitor.rest/pom.xml | 23 +++++++++++++++++++ .../src/main/java/monitor/utils/Utils.java | 5 ++-- monitor/src/main/java/monitor/Main.java | 6 ++--- pom.xml | 15 +++++++++++- 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/monitor.rest/pom.xml b/monitor.rest/pom.xml index 27defdb..8685e3b 100644 --- a/monitor.rest/pom.xml +++ b/monitor.rest/pom.xml @@ -40,4 +40,27 @@ + + + java-9+ + + [9,) + + + + + maven-compiler-plugin + + + --add-modules=java.xml.bind + --add-modules=java.xml.ws.annotation + --patch-module=java.xml.ws.annotation=${settings.localRepository}/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar + + + + + + + + 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..536b1b5 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; @@ -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..1b7a11d 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-core - 2.2.1 + 2.8.47 org.assertj @@ -102,4 +102,17 @@ + + + java-9+ + + [9,) + + + 9 + 9 + + + + From d10bd5b16a6cf37d1bd6f9aa79ed23b219489c62 Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Fri, 8 Jun 2018 12:12:17 +0200 Subject: [PATCH 2/3] Migrate to Java 10 --- monitor/src/main/java/monitor/Main.java | 2 +- pom.xml | 33 ++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/monitor/src/main/java/monitor/Main.java b/monitor/src/main/java/monitor/Main.java index 536b1b5..0262fee 100644 --- a/monitor/src/main/java/monitor/Main.java +++ b/monitor/src/main/java/monitor/Main.java @@ -28,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(); diff --git a/pom.xml b/pom.xml index 1b7a11d..6fd549d 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-core - 2.8.47 + 2.18.3 org.assertj @@ -104,15 +104,42 @@ - java-9+ + java-9 - [9,) + 9 9 9 + + java-10 + + 10 + + + 10 + 10 + + + + + + maven-compiler-plugin + + + org.ow2.asm + asm + 6.1.1 + + + + + + From 6763ee4e31715270bf263b8a2d8d088c54c60e4e Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Fri, 8 Jun 2018 12:16:12 +0200 Subject: [PATCH 3/3] Migrate to Java 11 --- monitor.rest/pom.xml | 49 +++++++++++++++++++++++--------------------- pom.xml | 29 ++++++++++---------------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/monitor.rest/pom.xml b/monitor.rest/pom.xml index 8685e3b..2beffd5 100644 --- a/monitor.rest/pom.xml +++ b/monitor.rest/pom.xml @@ -38,29 +38,32 @@ com.google.code.findbugs jsr305 - - - - java-9+ - - [9,) - - - - - maven-compiler-plugin - - - --add-modules=java.xml.bind - --add-modules=java.xml.ws.annotation - --patch-module=java.xml.ws.annotation=${settings.localRepository}/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar - - - - - - - + + 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/pom.xml b/pom.xml index 6fd549d..8d14fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ maven-compiler-plugin - 3.7.0 + 3.8.0 true @@ -122,23 +122,16 @@ 10 10 - - - - - maven-compiler-plugin - - - org.ow2.asm - asm - 6.1.1 - - - - - + + + java-11 + + 11 + + + 11 + 11 +