[java-idp-plugin-jetty] 04/05: Clear merge conflict

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-idp-plugin-jetty.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-jetty/commit/4eddfd546e5d0b6284fbdcfe9c21766df8770a99

commit 4eddfd546e5d0b6284fbdcfe9c21766df8770a99
Author: premeau <premeau at noreply.codeberg.org>
AuthorDate: Thu Dec 11 15:28:31 2025 +0100

    Clear merge conflict
---
 .../shibboleth/idp/module/jetty/module.properties  | 34 +++++++++++++++-------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
index 70dc63f..1bbd00e 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
@@ -93,19 +93,33 @@ jetty.Core.17.nonwindows = false
 jetty.Core.17.windows = true
 jetty.Core.17.replace = true
 
-jetty.Core.18.src = /net/shibboleth/idp/module/jetty/setjettybase.bat
-jetty.Core.18.dest = bin/setjettybase.bat
-jetty.Core.18.nonwindows = false
-jetty.Core.18.windows = true
+jetty.Core.18.src = /net/shibboleth/idp/module/jetty/setjettyversion.sh
+jetty.Core.18.dest = bin/setjettyversion.sh
+jetty.Core.18.nonwindows = true
+jetty.Core.18.windows = false
+jetty.Core.18.exec = true
 jetty.Core.18.replace = true
 
-jetty.Core.19.src = /net/shibboleth/idp/module/jetty/jetty-base-download-keystore.gpg
-jetty.Core.19.dest = credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg
-jetty.Core.19.replace = false
+jetty.Core.19.src = /net/shibboleth/idp/module/jetty/setjettybase.bat
+jetty.Core.19.dest = bin/setjettybase.bat
+jetty.Core.19.nonwindows = false
+jetty.Core.19.windows = true
+jetty.Core.19.replace = true
 
-jetty.Core.20.src = /net/shibboleth/idp/module/jetty/jetty.service
-jetty.Core.20.dest = jetty-base-12/jetty.service
+jetty.Core.20.src = /net/shibboleth/idp/module/jetty/setjettybase.sh
+jetty.Core.20.dest = bin/setjettybase.sh
 jetty.Core.20.nonwindows = true
 jetty.Core.20.windows = false
-jetty.Core.20.exec = false
+jetty.Core.20.exec = true
 jetty.Core.20.replace = true
+
+jetty.Core.21.src = /net/shibboleth/idp/module/jetty/jetty-base-download-keystore.gpg
+jetty.Core.21.dest = credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg
+jetty.Core.21.replace = false
+
+jetty.Core.22.src = /net/shibboleth/idp/module/jetty/jetty.service
+jetty.Core.22.dest = jetty-base-12/jetty.service
+jetty.Core.22.nonwindows = true
+jetty.Core.22.windows = false
+jetty.Core.22.exec = false
+jetty.Core.22.replace = true

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.