[java-idp-plugin-jetty] 01/02: JJETTY-35 Move default keystore under plugin directory

[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/5a048a80caed4e0b3eb827f7b54a827b06598730

commit 5a048a80caed4e0b3eb827f7b54a827b06598730
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Dec 11 19:25:57 2025 +0000

    JJETTY-35 Move default keystore under plugin directory
    
    https://shibboleth.atlassian.net/browse/JJETTY-35
    
    Move to %{idp/home}/credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg
---
 .../idp/plugin/jetty/cli/impl/JettyDownloadArguments.java   |   2 +-
 .../jetty-base-download-keystore.gpg                        | Bin
 .../net/shibboleth/idp/module/jetty/module.properties       |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadArguments.java b/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadArguments.java
index 37a7dc5..82b756f 100644
--- a/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadArguments.java
+++ b/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadArguments.java
@@ -60,7 +60,7 @@ public class JettyDownloadArguments extends AbstractIdPHomeAwareCommandLineArgum
 
     /** keystore Location. */
     @Parameter(names= {"--keystore"})
-    @Nonnull private String keystore="credentials/jetty-base-download-keystore.gpg";
+    @Nonnull private String keystore="credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg";
 
     /** The BaseURL of the download base artifact.
      * If not set, the command line initializes this from the maven coordinates. */
diff --git a/jetty-cli/src/test/resources/idphome-test/credentials/jetty-base-download-keystore.gpg b/jetty-cli/src/test/resources/idphome-test/credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg
similarity index 100%
rename from jetty-cli/src/test/resources/idphome-test/credentials/jetty-base-download-keystore.gpg
rename to jetty-cli/src/test/resources/idphome-test/credentials/net.shibboleth.idp.jetty-base/jetty-base-download-keystore.gpg
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 ac0dc8a..70dc63f 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
@@ -100,7 +100,7 @@ jetty.Core.18.windows = 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/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.20.src = /net/shibboleth/idp/module/jetty/jetty.service

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