From 4ddd1a1a8c7ced537fdb470113e520b37a033a2c Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Oct 2020 12:20:58 -0500 Subject: [PATCH] Issue #5492 - Adding java.features.* start properties + Simplifying alpn start modules in the process. (from 11 to 3) Signed-off-by: Joakim Erdfelt --- .../src/main/config/modules/alpn-impl.mod | 7 ------- .../src/main/config/modules/alpn-impl/alpn-10.mod | 4 ---- .../src/main/config/modules/alpn-impl/alpn-11.mod | 4 ---- .../src/main/config/modules/alpn-impl/alpn-12.mod | 4 ---- .../src/main/config/modules/alpn-impl/alpn-13.mod | 4 ---- .../src/main/config/modules/alpn-impl/alpn-14.mod | 4 ---- .../src/main/config/modules/alpn-impl/alpn-15.mod | 4 ---- .../alpn-impl/{alpn-8.mod => alpn-available-false.mod} | 0 .../alpn-impl/{alpn-9.mod => alpn-available-true.mod} | 0 .../jetty-alpn-server/src/main/config/modules/alpn.mod | 2 +- .../src/main/java/org/eclipse/jetty/start/StartArgs.java | 6 ++++++ 11 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod rename jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/{alpn-8.mod => alpn-available-false.mod} (100%) rename jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/{alpn-9.mod => alpn-available-true.mod} (100%) 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 deleted file mode 100644 index 0cc101702ccf..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod +++ /dev/null @@ -1,7 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Selects an ALPN (Application Layer Protocol Negotiation) implementation by java version. - -[depend] -alpn-impl/alpn-${java.version.platform} 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 deleted file mode 100644 index a3dbcb0e7c9d..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-9 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 deleted file mode 100644 index a3dbcb0e7c9d..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-9 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 deleted file mode 100644 index 4dbcf25f5839..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-11 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 deleted file mode 100644 index 4dbcf25f5839..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-11 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 deleted file mode 100644 index 4dbcf25f5839..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-11 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 deleted file mode 100644 index 4dbcf25f5839..000000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-11 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-available-false.mod similarity index 100% rename from jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod rename to jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-available-false.mod diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-9.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-available-true.mod similarity index 100% rename from jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-9.mod rename to jetty-alpn/jetty-alpn-server/src/main/config/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 index dc765d13b021..256ed05d56a9 100644 --- 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 index 7161387a2883..dd51d36e148d 100644 --- 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");