[xmlsectool] branch master updated: JPAR-103 - support Java 10

[Ian Young]

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

iay pushed a commit to branch master
in repository xmlsectool.

View the commit online:
http://git.shibboleth.net/view/?p=xmlsectool.git;a=commit;h=5ecbecd62a3bd33f946159d45b1bf44cc3e24daa

The following commit(s) were added to refs/heads/master by this push:
       new  5ecbecd   JPAR-103 - support Java 10
5ecbecd is described below

commit 5ecbecd62a3bd33f946159d45b1bf44cc3e24daa
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Mar 20 10:10:30 2018 +0000

    JPAR-103 - support Java 10
    
    Move up to a more recent version of java-support; use it to do Java version detection.
---
 pom.xml                                                    | 9 ++++++++-
 src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f3459e..e1c0807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <properties>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>3.2.0</opensaml.version>
-        <java-support.version>7.2.0</java-support.version>
+        <java-support.version>7.4.0-SNAPSHOT</java-support.version>
         <xmlsec.version>2.0.6</xmlsec.version>
     </properties>
 
@@ -118,6 +118,13 @@
 
         <!-- Test Dependencies -->
         <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <version>${java-support.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
             <scope>test</scope>
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
index 1ea28a1..caac786 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
@@ -49,6 +49,7 @@ import org.xmlunit.input.NormalizedSource;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.testing.TestSupport;
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -313,10 +314,9 @@ public abstract class BaseTest {
 
         // If we're using something claiming to be SunEC on OpenJDK 7, it may actually be broken
         // so don't bother with the tests.
-        // Note: test version last to avoid problems with OpenJDK 9 previews.
         final SecurityProviderTestSupport sup = new SecurityProviderTestSupport();
         if (ecsig.getProvider().getName().equals(SecurityProviderTestSupport.SUNEC_PROVIDER_NAME) &&
-                sup.isOpenJDK() && sup.getJavaVersion() <= 7) {
+                sup.isOpenJDK() && !TestSupport.isJavaV8OrLater()) {
             return false;
         }
 

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