[java-identity-provider] 02/04: Remove spurious admin-impl dependency (and associated damage)

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1c7c0961a8c31bbbbda3cdf97e0e31fc6a025cdd

commit 1c7c0961a8c31bbbbda3cdf97e0e31fc6a025cdd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 6 16:52:05 2020 +0100

    Remove spurious admin-impl dependency (and associated damage)
---
 idp-installer/pom.xml                                               | 6 ------
 .../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java   | 3 +--
 .../shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java    | 3 +--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index d373bb23d..9f8110a6e 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -36,12 +36,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-admin-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
         
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index 9a27797ff..412eaf4e4 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -56,7 +56,6 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.tools.ant.BuildException;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -288,7 +287,7 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
      * @return a list of the installed contents, may be empty if
      * nothing is installed or the plugin didn't install anything.
      */
-    @NotNull public List<String> getInstalledContents() {
+    @Nonnull public List<String> getInstalledContents() {
         loadCopiedFiles();
         return installedContents;
     }
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index 667bf9726..0c5f9bbf3 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -33,7 +33,6 @@ import javax.annotation.Nullable;
 
 import org.apache.tools.ant.BuildException;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -297,7 +296,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
     /** List the contents for the detailed plugin.
      * @param pluginId the pluginId
      */
-    private void doContentList(@NotNull final String pluginId) {
+    private void doContentList(@Nonnull final String pluginId) {
         final List<IdPPlugin> plugins = installer.getInstalledPlugins();
         IdPPlugin thePlugin = null;
         for (final IdPPlugin plugin: plugins) {

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