From 3aa8f507192b397c6a91f89fc193f89f5eba08dc Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 10 Oct 2025 11:10:05 +0200 Subject: [PATCH] SPARK-2362: Compatibility with Java 9 This switches in proprietary APIs that are used by the 'phone' plugin, depending on the version of Java that's used. --- core/pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 30f7fdd83..c59b0ef57 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,16 +27,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - **/org/jivesoftware/sparkimpl/preference/media/* - **/org/jivesoftware/sparkimpl/plugin/phone/JMFInit.* - - - org.apache.maven.plugins maven-jar-plugin @@ -316,6 +306,50 @@ false + + jdk9 + + [9,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + **/org/jivesoftware/sparkimpl/preference/media/* + **/org/jivesoftware/sparkimpl/plugin/phone/JMFInit.* + + + --add-modules + java.se,java.desktop + + + + + + + + jdk8 + + (,9) + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + **/org/jivesoftware/sparkimpl/preference/media/* + **/org/jivesoftware/sparkimpl/plugin/phone/JMFInit.* + + + + + +