[java-identity-provider] branch main updated: Favor manifest over property for plugin version.

[Scott Cantor]

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

scantor 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=a4c41bc3aa49d0ece12c5b34e8eff55c27938b50

The following commit(s) were added to refs/heads/main by this push:
       new  a4c41bc3a Favor manifest over property for plugin version.
a4c41bc3a is described below

commit a4c41bc3aa49d0ece12c5b34e8eff55c27938b50
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Oct 2 09:29:20 2020 -0400

    Favor manifest over property for plugin version.
---
 .../net/shibboleth/idp/plugin/PropertyDrivenIdPPlugin.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/plugin/PropertyDrivenIdPPlugin.java b/idp-admin-api/src/main/java/net/shibboleth/idp/plugin/PropertyDrivenIdPPlugin.java
index 3e95c3491..8989dd5ff 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/plugin/PropertyDrivenIdPPlugin.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/plugin/PropertyDrivenIdPPlugin.java
@@ -123,13 +123,14 @@ public abstract class PropertyDrivenIdPPlugin extends AbstractIdPPlugin {
         
         pluginId = StringSupport.trimOrNull(pluginProperties.getProperty(PLUGIN_ID_PROPERTY));
         
-        String version = StringSupport.trimOrNull(pluginProperties.getProperty(PLUGIN_VERSION_PROPERTY));
+        String version = getClass().getPackage().getImplementationVersion();
         if (version == null) {
-            version = getClass().getPackage().getImplementationVersion();
-        }
-        
-        if (version == null) {
-            throw new PluginException("No plugin version property or package attribute available");
+            version = StringSupport.trimOrNull(pluginProperties.getProperty(PLUGIN_VERSION_PROPERTY));
+            if (version == null) {
+                throw new PluginException("No plugin version property or package attribute available");
+            }
+        } else {
+            log.debug("Ignoring plugin version property in favor of package manifest");
         }
         
         try {

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