Move add-opens to separate bndrun file for Java 9+

Signed-off-by: Wouter Born <[email protected]>

launch/app/app-java9plus.bndrun

@@ -0,0 +1,15 @@
+-include: app.bndrun
+
+-runee: JavaSE-9
+
+-runvm.java9plus: \
+	--add-opens java.base/java.io=ALL-UNNAMED,\
+	--add-opens java.base/java.lang=ALL-UNNAMED,\
+	--add-opens java.base/java.lang.reflect=ALL-UNNAMED,\
+	--add-opens java.base/java.net=ALL-UNNAMED,\
+	--add-opens java.base/java.security=ALL-UNNAMED,\
+	--add-opens java.base/java.text=ALL-UNNAMED,\
+	--add-opens java.base/java.util=ALL-UNNAMED,\
+	--add-opens java.desktop/java.awt.font=ALL-UNNAMED,\
+	--add-opens java.naming/javax.naming.spi=ALL-UNNAMED,\
+	--add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED

launch/app/app.bndrun

@@ -66,7 +66,6 @@ feature.openhab-model-runtime-all: \
 
 -runfw: org.eclipse.osgi
 
-# Set 'java9plus' below to true when using Java 9+ as runee
 -runee: JavaSE-1.8
 
 -runrequires.ee: \
@@ -88,24 +87,6 @@ feature.openhab-model-runtime-all: \
 	bnd.identity;id='org.apache.aries.jpa.container',\
 	bnd.identity;id='org.openhab.core.test'
 
-# Open internal API packages on Java 9+ to prevent warnings when used by reflection
-java9plus = false
-
-runvm.java9plus: \
-	--add-opens java.base/java.io=ALL-UNNAMED,\
-	--add-opens java.base/java.lang=ALL-UNNAMED,\
-	--add-opens java.base/java.lang.reflect=ALL-UNNAMED,\
-	--add-opens java.base/java.net=ALL-UNNAMED,\
-	--add-opens java.base/java.security=ALL-UNNAMED,\
-	--add-opens java.base/java.text=ALL-UNNAMED,\
-	--add-opens java.base/java.util=ALL-UNNAMED,\
-	--add-opens java.desktop/java.awt.font=ALL-UNNAMED,\
-	--add-opens java.naming/javax.naming.spi=ALL-UNNAMED,\
-	--add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED
-
--runvm: \
-	${if;${java9plus};${runvm.java9plus};}
-
 #
 # done
 #