Skip to content
Snippets Groups Projects
Commit 34a5daf5 authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-21499: Upgrade to Jetty 10.0.18 for the standalone packaging

parent 09ae89c5
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@
<keypress.version>2.1.5</keypress.version>
<!-- We are stuck at version 9.x until we upgrade to a version of SolrJ which use a more recent version (or something else) -->
<jetty.client.version>9.4.53.v20231009</jetty.client.version>
<jetty.server.version>10.0.17</jetty.server.version>
<jetty.server.version>10.0.18</jetty.server.version>
<jetty.version>${jetty.client.version}</jetty.version>
<netty.version>4.1.100.Final</netty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
......
......@@ -80,6 +80,7 @@
</Default>
</Property>
</Set>
<Set name="deferInitialScan"><Property name="jetty.deploy.deferInitialScan" default="false"/></Set>
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
<Set name="configurationManager">
......
......@@ -24,7 +24,7 @@
<!-- =============================================================== -->
<!-- Documentation of this file format can be found at: -->
<!-- https://www.eclipse.org/jetty/documentation/current/ -->
<!-- https://eclipse.dev/jetty/documentation/ -->
<!-- -->
<!-- Additional configuration files are available in $JETTY_HOME/etc -->
<!-- and can be mixed in. See start.ini file for the default -->
......
......@@ -42,6 +42,12 @@ etc/jetty-deploy.xml
# Defaults Descriptor for all deployed webapps
# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault.xml
# Defer Initial Scan
# true to have the initial scan deferred until the Server component is started.
# Note: deploy failures do not fail server startup in a deferred initial scan mode.
# false (default) to have initial scan occur as normal.
# jetty.deploy.deferInitialScan=false
# Monitored directory scan period (seconds)
# jetty.deploy.scanInterval=1
......
......@@ -108,15 +108,11 @@ etc/jetty-ssl-context.xml
## The JSSE Provider.
# jetty.sslContext.provider=
## The KeyStore file path (relative to $JETTY_BASE).
## The KeyStore file path, either an absolute path or a relative path to $JETTY_BASE.
# jetty.sslContext.keyStorePath=etc/keystore.p12
## The KeyStore absolute file path.
# jetty.sslContext.keyStoreAbsolutePath=${jetty.base}/etc/keystore.p12
## The TrustStore file path (relative to $JETTY_BASE).
## The TrustStore file path, either an absolute path or a relative path to $JETTY_BASE.
# jetty.sslContext.trustStorePath=etc/keystore.p12
## The TrustStore absolute file path.
# jetty.sslContext.trustStoreAbsolutePath=${jetty.base}/etc/keystore.p12
## The KeyStore password.
# jetty.sslContext.keyStorePassword=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment