[java-identity-provider] branch master updated: Log correct IdPVersion when building the war

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  6093e1e7  Log correct IdPVersion when building the war
6093e1e7 is described below

commit 6093e1e7ee04b22954fde7e3c32909c01bde23de
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Feb 5 13:09:32 2020 +0000

    Log correct IdPVersion when building the war
---
 .../src/main/java/net/shibboleth/idp/installer/BuildWar.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
index 20e57af..3582d52 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
@@ -72,12 +72,7 @@ public final class BuildWar extends AbstractInitializableComponent {
         final Path target = installerProps.getTargetDir();
         final Path warFile = target.resolve("war").resolve("idp.war");
 
-        String currentVersion = currentState.getInstalledVersion();
-        if (currentVersion == null) {
-            // indicates a clean install
-            currentVersion = Version.getVersion();
-        }
-        log.info("Rebuilding {}, Version {}", warFile.toAbsolutePath(), currentVersion);
+        log.info("Rebuilding {}, Version {}", warFile.toAbsolutePath(), Version.getVersion());
         InstallerSupport.deleteTree(target.resolve("webpapp"));
         final Path webAppTmp =target.resolve("webpapp.tmp");
         InstallerSupport.deleteTree(webAppTmp);

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