Skip to content

Commit

Permalink
Fixed module dependencies that previously depended on ssl, now depe…
Browse files Browse the repository at this point in the history
…nds on `ssl-context`.

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

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
  • Loading branch information
sbordet committed Nov 28, 2024
1 parent b62c774 commit 9aa9cdb
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Enables secure remote RMI access to platform MBeans.

[depend]
ssl
ssl-context
jmx-remote

[files]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ connector
ssl

[depend]
ssl
ssl-context

[xml]
etc/jetty-ssl-context-reload.xml
Expand Down
4 changes: 2 additions & 2 deletions jetty-home/src/main/resources/modules/conscrypt.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9aa9cdb

Please sign in to comment.