[java-shib-profile] branch main updated: IDP-2242 We need to rationalize the use of plugin categories.

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-shib-profile.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=d43cef122d1ab3aac7d735233ad17fe22444d176

The following commit(s) were added to refs/heads/main by this push:
     new d43cef1  IDP-2242 We need to rationalize the use of plugin categories.
d43cef1 is described below

commit d43cef122d1ab3aac7d735233ad17fe22444d176
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Feb 8 20:28:35 2024 +0000

    IDP-2242 We need to rationalize the use of plugin categories.
    
    https://shibboleth.atlassian.net/browse/IDP-2242
    Allow installation of OutOfDate plugins
    
    Also
    https://shibboleth.atlassian.net/browse/IDP-2241
    We need to rationalize the use of plugin categories.
---
 .../InstallableComponentSupport.java                 | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
index a2cdf8b..a9755f3 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/installablecomponent/InstallableComponentSupport.java
@@ -100,28 +100,34 @@ public final class InstallableComponentSupport {
             @Nonnull final InstallableComponentInfo pluginInfo) {
         final List<InstallableComponentVersion> availableVersions = new ArrayList<>(pluginInfo.getAvailableVersions().keySet());
         availableVersions.sort(null);
-        log.debug("Considering versions: {}", availableVersions);
+        log.debug("Considering plugin versions: {}", availableVersions);
     
         for (int i = availableVersions.size()-1; i >= 0; i--) {
             final InstallableComponentVersion version = availableVersions.get(i);
             if (version.compareTo(pluginVersion) <= 0) {
-                log.debug("Version {} is less than or the same as {}. All done", version, pluginVersion);
+                log.debug("Available version {} is less than or the same as {}. All done", version, pluginVersion);
                 return null;
             }
             final VersionInfo versionInfo = pluginInfo.getAvailableVersions().get(version);
-            if (versionInfo.getSupportLevel() != SupportLevel.Current) {
-                log.debug("Version {} has support level {}, ignoring", version, versionInfo.getSupportLevel());
+            final SupportLevel supportLevel = versionInfo.getSupportLevel();
+            if (supportLevel != SupportLevel.Current && supportLevel != SupportLevel.OutOfDate) {
+                log.debug("Available version {} has support level {}, ignoring", version, supportLevel);
                 continue;
             }
             if (!pluginInfo.isSupportedWithIdPVersion(version, installIntoVersion)) {
-                log.debug("Version {} is not supported with Application Version {}", version, installIntoVersion);
+                log.debug("Available version {} is not supported with Application Version {}", version, installIntoVersion);
                 continue;
             }
-            log.debug("Version {} is supported with Application Version {}", version, installIntoVersion);
+            log.debug("Plugin version {} is supported with Application Version {}", version, installIntoVersion);
             if (pluginInfo.getUpdateURL(version) == null || pluginInfo.getUpdateBaseName(version) == null) {
-                log.debug("Version {} is does not have update information", version);
+                log.debug("Available version {} is does not have update information", version);
                 continue;
             }
+            if (supportLevel == SupportLevel.OutOfDate) {
+                log.info("Selected version {} has support level {}", version, supportLevel);
+            } else {
+                log.debug("Selected version {} has support level {}", version, supportLevel);
+            }
             return version;
         }
         return null;

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