From 9aa9cdb2fb6e82f449f92a3290fbac5a34bfbe31 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 28 Nov 2024 10:51:35 +0100
Subject: [PATCH] Fixed module dependencies that previously depended on `ssl`,
 now depends on `ssl-context`.

Renamed `conscrypt.xml` to `jetty-conscrypt.xml` as per convention.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../jetty-jmx/src/main/config/modules/jmx-remote-ssl.mod      | 2 +-
 .../jetty-keystore/src/main/config/modules/test-keystore.mod  | 2 +-
 .../jetty-server/src/main/config/modules/ssl-reload.mod       | 2 +-
 jetty-home/src/main/resources/modules/conscrypt.mod           | 4 ++--
 .../modules/conscrypt/{conscrypt.xml => jetty-conscrypt.xml}  | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename jetty-home/src/main/resources/modules/conscrypt/{conscrypt.xml => jetty-conscrypt.xml} (100%)

diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx-remote-ssl.mod b/jetty-core/jetty-jmx/src/main/config/modules/jmx-remote-ssl.mod
index 768059b9f461..398c05cc0254 100644
--- a/jetty-core/jetty-jmx/src/main/config/modules/jmx-remote-ssl.mod
+++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx-remote-ssl.mod
@@ -2,7 +2,7 @@
 Enables secure remote RMI access to platform MBeans.
 
 [depend]
-ssl
+ssl-context
 jmx-remote
 
 [files]
diff --git a/jetty-core/jetty-keystore/src/main/config/modules/test-keystore.mod b/jetty-core/jetty-keystore/src/main/config/modules/test-keystore.mod
index 1c1b98fb3dc0..bfa6b528f194 100644
--- a/jetty-core/jetty-keystore/src/main/config/modules/test-keystore.mod
+++ b/jetty-core/jetty-keystore/src/main/config/modules/test-keystore.mod
@@ -7,7 +7,7 @@ demo
 ssl
 
 [before]
-ssl
+ssl-context
 
 [files]
 maven://org.bouncycastle/bcpkix-jdk15to18/${bouncycastle.version}|lib/bouncycastle/bcpkix-jdk15to18-${bouncycastle.version}.jar
diff --git a/jetty-core/jetty-server/src/main/config/modules/ssl-reload.mod b/jetty-core/jetty-server/src/main/config/modules/ssl-reload.mod
index 9dca8473d55b..54c3710de963 100644
--- a/jetty-core/jetty-server/src/main/config/modules/ssl-reload.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/ssl-reload.mod
@@ -6,7 +6,7 @@ connector
 ssl
 
 [depend]
-ssl
+ssl-context
 
 [xml]
 etc/jetty-ssl-context-reload.xml
diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod
index 174fe11bbb78..cc25d97f6e94 100644
--- a/jetty-home/src/main/resources/modules/conscrypt.mod
+++ b/jetty-home/src/main/resources/modules/conscrypt.mod
@@ -13,10 +13,10 @@ alpn-impl
 [files]
 maven://org.conscrypt/conscrypt-openjdk-uber/${conscrypt.version}|lib/conscrypt/conscrypt-uber-${conscrypt.version}.jar
 #maven://org.conscrypt/conscrypt-openjdk/${conscrypt.version}/jar/linux-x86_64|lib/conscrypt/conscrypt-${conscrypt.version}-linux-x86_64.jar
-basehome:modules/conscrypt/conscrypt.xml|etc/conscrypt.xml
+basehome:modules/conscrypt/jetty-conscrypt.xml|etc/jetty-conscrypt.xml
 
 [xml]
-etc/conscrypt.xml
+etc/jetty-conscrypt.xml
 
 [lib]
 lib/conscrypt/conscrypt-uber-${conscrypt.version}.jar
diff --git a/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml b/jetty-home/src/main/resources/modules/conscrypt/jetty-conscrypt.xml
similarity index 100%
rename from jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml
rename to jetty-home/src/main/resources/modules/conscrypt/jetty-conscrypt.xml