Issue #5492 - Adding java.features.* start properties

+ Simplifying alpn start modules in the process. (from 11 to 3) Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Oct 22, 2020 · 4ddd1a1 · 4ddd1a1
1 parent 4ecaf30
commit 4ddd1a1
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 32 deletions.
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod
diff --git a/.../main/config/modules/alpn-impl/alpn-8.mod → ...odules/alpn-impl/alpn-available-false.mod b/.../main/config/modules/alpn-impl/alpn-8.mod → ...odules/alpn-impl/alpn-available-false.mod
diff --git a/.../main/config/modules/alpn-impl/alpn-9.mod → ...modules/alpn-impl/alpn-available-true.mod b/.../main/config/modules/alpn-impl/alpn-9.mod → ...modules/alpn-impl/alpn-available-true.mod
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -5,7 +5,7 @@ Enables the ALPN (Application Layer Protocol Negotiation) TLS extension.
 
 [depend]
 ssl
-alpn-impl
+alpn-impl/alpn-available-${java.feature.alpn}
 
 [lib]
 lib/jetty-alpn-client-${jetty.version}.jar

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1505,6 +1505,12 @@ public void setProperty(String key, String value, String source)
             {
                 JavaVersion ver = JavaVersion.parse(value);
                 properties.setProperty("java.version.platform", Integer.toString(ver.getPlatform()), source);
+
+                // features built into java.
+                properties.setProperty("java.feature.alpn", Boolean.toString(ver.getPlatform() >= 9), source);
+                properties.setProperty("java.feature.jpms", Boolean.toString(ver.getPlatform() >= 9), source);
+                properties.setProperty("java.feature.loom", Boolean.toString(ver.getPlatform() >= 16), source);
+
                 // @deprecated - below will be removed in Jetty 10.x
                 properties.setProperty("java.version.major", Integer.toString(ver.getMajor()), "Deprecated");
                 properties.setProperty("java.version.minor", Integer.toString(ver.getMinor()), "Deprecated");