From 8a3b0e55100f638ea7818a23a61ab2fca2728884 Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Tue, 25 Jul 2017 11:27:27 +0200 Subject: [PATCH 1/5] 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 9b0f963a5f5e0a112ed4dadaa229bfc1525e8512 Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Fri, 8 Jun 2018 12:12:17 +0200 Subject: [PATCH 2/5] 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 a36de67ae8f6018bd380d4bd005869cd20364dfd Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Fri, 8 Jun 2018 12:16:12 +0200 Subject: [PATCH 3/5] 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 + From 692005765828392e085628fa035f64c4b1d0a173 Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Sun, 21 Oct 2018 21:33:17 +0200 Subject: [PATCH 4/5] Require Java 11 --- pom.xml | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 8d14fbe..fc922f9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -102,37 +102,4 @@ - - - java-9 - - 9 - - - 9 - 9 - - - - java-10 - - 10 - - - 10 - 10 - - - - java-11 - - 11 - - - 11 - 11 - - - - From 6ff97763f8f68321aef7c6bd1250e10320cc57bd Mon Sep 17 00:00:00 2001 From: Nicolai Parlog Date: Sun, 21 Oct 2018 21:33:46 +0200 Subject: [PATCH 5/5] Partially modularize application --- .../src/main/java/module-info.java | 4 ++++ .../src/main/java/module-info.java | 4 ++++ monitor.observer/src/main/java/module-info.java | 3 +++ monitor.rest/pom.xml | 13 +++++++++++++ monitor.rest/src/main/java/module-info.java | 14 ++++++++++++++ monitor.statistics/src/main/java/module-info.java | 4 ++++ monitor.utils/src/main/java/module-info.java | 3 +++ move-modules.sh | 14 ++++++++++++++ 8 files changed, 59 insertions(+) create mode 100644 monitor.observer.alpha/src/main/java/module-info.java create mode 100644 monitor.observer.beta/src/main/java/module-info.java create mode 100644 monitor.observer/src/main/java/module-info.java create mode 100644 monitor.rest/src/main/java/module-info.java create mode 100644 monitor.statistics/src/main/java/module-info.java create mode 100644 monitor.utils/src/main/java/module-info.java create mode 100755 move-modules.sh diff --git a/monitor.observer.alpha/src/main/java/module-info.java b/monitor.observer.alpha/src/main/java/module-info.java new file mode 100644 index 0000000..f8aaa06 --- /dev/null +++ b/monitor.observer.alpha/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module monitor.observer.alpha { + requires monitor.observer; + exports monitor.observer.alpha; +} diff --git a/monitor.observer.beta/src/main/java/module-info.java b/monitor.observer.beta/src/main/java/module-info.java new file mode 100644 index 0000000..a53c998 --- /dev/null +++ b/monitor.observer.beta/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module monitor.observer.beta { + requires monitor.observer; + exports monitor.observer.beta; +} diff --git a/monitor.observer/src/main/java/module-info.java b/monitor.observer/src/main/java/module-info.java new file mode 100644 index 0000000..68622f9 --- /dev/null +++ b/monitor.observer/src/main/java/module-info.java @@ -0,0 +1,3 @@ +module monitor.observer { + exports monitor.observer; +} diff --git a/monitor.rest/pom.xml b/monitor.rest/pom.xml index 2beffd5..3ef842d 100644 --- a/monitor.rest/pom.xml +++ b/monitor.rest/pom.xml @@ -66,4 +66,17 @@ + + + + maven-compiler-plugin + + + --patch-module=java.annotation=${settings.localRepository}/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar + + + + + + diff --git a/monitor.rest/src/main/java/module-info.java b/monitor.rest/src/main/java/module-info.java new file mode 100644 index 0000000..ea25897 --- /dev/null +++ b/monitor.rest/src/main/java/module-info.java @@ -0,0 +1,14 @@ +module monitor.rest { + requires java.xml.bind; + requires java.annotation; + + requires monitor.utils; + requires monitor.statistics; + + requires spark.core; + requires jackson.core; + requires jackson.databind; + + exports monitor.rest; + opens monitor.rest to java.xml.bind; +} diff --git a/monitor.statistics/src/main/java/module-info.java b/monitor.statistics/src/main/java/module-info.java new file mode 100644 index 0000000..e8c6528 --- /dev/null +++ b/monitor.statistics/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module monitor.statistics { + requires monitor.observer; + exports monitor.statistics; +} diff --git a/monitor.utils/src/main/java/module-info.java b/monitor.utils/src/main/java/module-info.java new file mode 100644 index 0000000..3250e4a --- /dev/null +++ b/monitor.utils/src/main/java/module-info.java @@ -0,0 +1,3 @@ +module monitor.utils { + exports monitor.utils; +} diff --git a/move-modules.sh b/move-modules.sh new file mode 100755 index 0000000..e9ad325 --- /dev/null +++ b/move-modules.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +rm -rf mods +mkdir mods +mv app/utils.jar mods +mv app/observer* mods +mv app/statistics.jar mods +mv app/rest.jar mods +mv app/jaxb-api.jar mods +mv app/javax.activation.jar mods +mv app/javax.annotation-api.jar mods +mv app/spark-core.jar mods +mv app/jackson-core.jar mods +mv app/jackson-databind.jar mods