[java-idp-plugin-scripting] 02/03: IDP-1595 Change tests to reflect changed PluginState API
Rod Widdowson
rdw at steadingsoftware.com
Tue Aug 4 13:06:57 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=1b78854099b4ed8c01898c690277cb7280121fe9
commit 1b78854099b4ed8c01898c690277cb7280121fe9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 4 13:52:29 2020 +0100
IDP-1595 Change tests to reflect changed PluginState API
https://issues.shibboleth.net/jira/browse/IDP-1595
---
.../shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java | 5 +----
.../net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
index 2ff405a..86c442f 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
@@ -23,8 +23,6 @@ import java.net.URL;
import java.nio.file.Path;
import java.util.List;
-import org.springframework.core.io.ClassPathResource;
-
import net.shibboleth.idp.plugin.AbstractPluginDescription;
import net.shibboleth.utilities.java.support.collection.Pair;
@@ -46,8 +44,7 @@ public class NashornDescription extends AbstractPluginDescription {
@Override
public List<URL> getUpdateURLs() throws IOException {
return List.of(
- new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"),
- new ClassPathResource("META-INF/plugins/plugin.props").getURL());
+ new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"));
}
/** Create a {@link Pair } as needed.
diff --git a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
index 9fc056a..04835ad 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
@@ -23,8 +23,6 @@ import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
-import org.springframework.core.io.ClassPathResource;
-
import net.shibboleth.idp.plugin.AbstractPluginDescription;
import net.shibboleth.utilities.java.support.collection.Pair;
@@ -42,8 +40,7 @@ public class RhinoDescription extends AbstractPluginDescription {
@Override
public List<URL> getUpdateURLs() throws IOException {
return List.of(
- new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"),
- new ClassPathResource("META-INF/plugins/plugin.props").getURL());
+ new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"));
}
@Override
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list