[java-idp-plugin-jetty] 04/04: JJETTY-13 Implement Jetty-base plugin V2

[Rod Widdowson]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=97ca98019d4644fb6b1d90c41a9c74cf7f996b19

commit 97ca98019d4644fb6b1d90c41a9c74cf7f996b19
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 30 11:22:44 2025 +0100

    JJETTY-13 Implement Jetty-base plugin V2
    
    https://shibboleth.atlassian.net/browse/JJETTY-13
    
    Roll back IdP version to 5.1
---
 .../net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadCLI.java   | 5 +++--
 .../src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java   | 5 +----
 pom.xml                                                              | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadCLI.java b/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadCLI.java
index 4df011d..6ecf33c 100644
--- a/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadCLI.java
+++ b/jetty-cli/src/main/java/net/shibboleth/idp/plugin/jetty/cli/impl/JettyDownloadCLI.java
@@ -43,8 +43,8 @@ import org.springframework.core.io.Resource;
 import net.shibboleth.idp.Version;
 import net.shibboleth.idp.cli.AbstractIdPHomeAwareCommandLine;
 import net.shibboleth.idp.installer.InstallerSupport;
-import net.shibboleth.idp.installer.TrustStore;
-import net.shibboleth.idp.installer.TrustStore.Signature;
+import net.shibboleth.idp.installer.plugin.impl.TrustStore;
+import net.shibboleth.idp.installer.plugin.impl.TrustStore.Signature;
 import net.shibboleth.shared.cli.AbstractCommandLine;
 import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
@@ -266,6 +266,7 @@ public class JettyDownloadCLI extends AbstractIdPHomeAwareCommandLine<JettyDownl
 
             final TrustStore trust = new TrustStore();
             trust.setTrustStore(keyStore.toAbsolutePath().toString());
+            trust.setPluginId("dummyId");
             trust.initialize();
             final Signature sig = TrustStore.signatureOf(sigStream);
             if (!trust.contains(sig)) {
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
index 7ae119d..426444f 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
@@ -13,20 +13,17 @@
  */
 package net.shibboleth.idp.module.jetty;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 
 import net.shibboleth.idp.Version;
-import net.shibboleth.idp.installer.InstallerProperties;
+import net.shibboleth.idp.installer.impl.InstallerProperties;
 import net.shibboleth.idp.module.impl.PluginIdPModule;
 import net.shibboleth.profile.module.ModuleContext;
 import net.shibboleth.profile.module.ModuleException;
diff --git a/pom.xml b/pom.xml
index 2a15f36..77e4f29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
     <properties>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
-        <idp.version>5.2.0-SNAPSHOT</idp.version>
+        <idp.version>5.1.0</idp.version>
         <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
 
         <shib-profile.groupId>net.shibboleth</shib-profile.groupId>

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