[java-identity-provider] branch main updated: Fix "test only" build.

[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=99a429919e6bef9722e53afdc354b2f9c1e316d8

The following commit(s) were added to refs/heads/main by this push:
       new  99a429919 Fix "test only" build.
99a429919 is described below

commit 99a429919e6bef9722e53afdc354b2f9c1e316d8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 26 14:06:10 2021 +0100

    Fix "test only" build.
    
    The WAR dependency checker requires that we are doing and 'install' build
    and the nightly are not install builds.  If there is no target for
    id-war-distribution just skip the test.
---
 .../test/java/net/shibboleth/idp/dependencies/DependencyTest.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/test/java/net/shibboleth/idp/dependencies/DependencyTest.java b/idp-installer/src/test/java/net/shibboleth/idp/dependencies/DependencyTest.java
index 6c67153d8..ca9db6d76 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/dependencies/DependencyTest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/dependencies/DependencyTest.java
@@ -155,7 +155,7 @@ public class DependencyTest extends OpenSAMLInitBaseTestCase implements PomLoade
      * @throws IOException if the file doesn't exist
      * @throws MavenInvocationException if we fail to download a pom or a dependency
      */
-    @Test(enabled=false) public void testDependencies() throws IOException, MavenInvocationException {
+    @Test(enabled=true) public void testDependencies() throws IOException, MavenInvocationException {
         if (!idpParent.getDuplicates().isEmpty()) {
             report.format("Duplicates found parsing the poms\n");
             for (final Pair<PomArtifact,PomArtifact> poms : idpParent.getDuplicates()) {
@@ -168,7 +168,9 @@ public class DependencyTest extends OpenSAMLInitBaseTestCase implements PomLoade
             }
         }
         final Path lib = Path.of("../idp-war-distribution/target/idp-war-distribution-"+ idpParent.getOurInfo().getVersion()).resolve("WEB-INF").resolve("lib");
-        assertTrue(Files.exists(lib), "idp-war must have been built");
+	if (!Files.exists(lib)) {
+	     throw new SkipException("War distribution target not found");
+	}
         final Map<String, String> names = new HashMap<>();
         int wrongVersion = 0;
         int found = 0;

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