[xmlsectool] branch main updated: XSTJ-88 - Port xmlsectool to the Java 17 stack
Ian Young
ian at iay.org.uk
Tue Jan 24 13:53:53 UTC 2023
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository xmlsectool.
View the commit online:
http://git.shibboleth.net/view/?p=xmlsectool.git;a=commit;h=3d9196e297e20f16c649c157e88bcb27a8b148c9
The following commit(s) were added to refs/heads/main by this push:
new 3d9196e XSTJ-88 - Port xmlsectool to the Java 17 stack
3d9196e is described below
commit 3d9196e297e20f16c649c157e88bcb27a8b148c9
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Jan 24 13:53:47 2023 +0000
XSTJ-88 - Port xmlsectool to the Java 17 stack
https://shibboleth.atlassian.net/browse/XSTJ-88
---
pom.xml | 39 +++++++++-------------
.../tool/xmlsectool/CommandLineArguments.java | 4 +--
.../tool/xmlsectool/SchemaValidator.java | 8 ++---
.../net/shibboleth/tool/xmlsectool/XMLSecTool.java | 14 ++++----
.../net/shibboleth/tool/xmlsectool/BaseTest.java | 14 ++++----
.../net/shibboleth/tool/xmlsectool/XSTJ51Test.java | 4 +--
.../net/shibboleth/tool/xmlsectool/XSTJ82Test.java | 4 +--
.../net/shibboleth/tool/xmlsectool/XSTJ83Test.java | 4 +--
8 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f890bf..b06bc19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.3.5</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.tool</groupId>
<artifactId>xmlsectool</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>XMLSecTool</name>
@@ -24,8 +24,9 @@
<properties>
<opensaml.groupId>org.opensaml</opensaml.groupId>
- <opensaml.version>4.3.0</opensaml.version>
- <java-support.version>8.3.1</java-support.version>
+ <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
+ <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
+ <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
<dependenciesDirectory>${project.build.directory}/dependencies</dependenciesDirectory>
</properties>
@@ -35,14 +36,21 @@
<groupId>${slf4j.groupId}</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ <version>${shib-shared.version}</version>
+ </dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <version>${shib-shared.version}</version>
</dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core</artifactId>
+ <artifactId>opensaml-core-api</artifactId>
<version>${opensaml.version}</version>
</dependency>
<dependency>
@@ -115,13 +123,6 @@
</dependency>
<!-- 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>
@@ -132,14 +133,6 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
- <version>${opensaml.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
index 7a4a1e8..d693a62 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
@@ -24,8 +24,8 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/** Command line arguments for the {@link XMLSecTool} command line tool. */
public class CommandLineArguments {
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
index d9ed534..9e8df41 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
@@ -32,10 +32,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
+import net.shibboleth.shared.xml.SchemaBuilder;
+import net.shibboleth.shared.xml.SchemaBuilder.SchemaLanguage;
/**
* Validates XML documents based on a schema file, or a collection of schema
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java b/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
index a341328..c2acada 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/XMLSecTool.java
@@ -91,12 +91,12 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.AttributeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.shared.xml.SerializeSupport;
/**
* A command line tool for checking an XML file for well-formedness and validity as well as
@@ -1036,4 +1036,4 @@ public final class XMLSecTool {
log = LoggerFactory.getLogger(XMLSecTool.class);
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
index 344c2e3..4884a12 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
@@ -43,13 +43,13 @@ import org.xmlunit.builder.Input;
import org.xmlunit.diff.Diff;
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.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
-import net.shibboleth.utilities.java.support.xml.SerializeSupport;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.impl.BasicParserPool;
+import net.shibboleth.shared.xml.ParserPool;
+import net.shibboleth.shared.xml.SerializeSupport;
+import net.shibboleth.shared.xml.XMLParserException;
public abstract class BaseTest {
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
index 096abaf..2272096 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
@@ -30,8 +30,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.SchemaBuilder.SchemaLanguage;
public class XSTJ51Test extends BaseTest {
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ82Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ82Test.java
index a7b3268..119ef23 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ82Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ82Test.java
@@ -12,8 +12,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.SchemaBuilder.SchemaLanguage;
/**
* Test for <code>--pkcs11Config</code> option under Java 11+.
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ83Test.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ83Test.java
index 0fbf22a..45239d2 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ83Test.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ83Test.java
@@ -20,8 +20,8 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.SchemaBuilder.SchemaLanguage;
/**
* Test for basic EC signatures.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list