[java-mvn-enforcer] 02/02: JMVN-64 Rebase on Shibboleth Java 17 platform
Rod Widdowson
rdw at steadingsoftware.com
Fri Apr 18 12:18:41 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-mvn-enforcer.
View the commit online:
http://git.shibboleth.net/view/?p=java-mvn-enforcer.git;a=commit;h=9376c0b09529d8eb11c1bfb09f220c87bcce760c
commit 9376c0b09529d8eb11c1bfb09f220c87bcce760c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 18 13:17:05 2025 +0100
JMVN-64 Rebase on Shibboleth Java 17 platform
https://shibboleth.atlassian.net/browse/JMVN-64
Move the enforcer forward to Java 17
* Temporarily parented from the SNAPSHOT parent project
* Code changes to reflect classes that have moved
* Strip out some accidental including of Spring
---
pom.xml | 21 +++++----------------
.../mvn/enforcer/impl/BaseSigChecker.java | 2 +-
.../mvn/enforcer/impl/DependencyChecker.java | 5 ++---
.../shibboleth/mvn/enforcer/impl/JarEnforcer.java | 6 +++---
.../net/shibboleth/mvn/enforcer/impl/ParsedPom.java | 10 +++++-----
.../mvn/enforcer/impl/ProjectPomContext.java | 4 ++--
.../mvn/enforcer/cli/impl/ListKeysCLI.java | 2 +-
.../cli/impl/ListKeysCommandLineArguments.java | 2 +-
8 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0eae2c7..c229828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>net.shibboleth.maven.enforcer.rules</groupId>
<artifactId>maven-dist-enforcer-parent</artifactId>
- <version>1.0.5</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.maven.enforcer.rules</groupId>
@@ -23,14 +23,13 @@
<dependencies>
<!-- Compile Dependencies -->
-
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-support</artifactId>
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-cli</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -53,16 +52,6 @@
<artifactId>jsr305</artifactId>
</dependency>
<!-- Test -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
index 40bdcf1..187732a 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import net.shibboleth.mvn.enforcer.impl.GPGKeyRing.Signature;
import net.shibboleth.mvn.enforcer.impl.ParsedPom.DependencyPomArtifact;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A class to iterate which understands signatures on jar files and maven.
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/DependencyChecker.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/DependencyChecker.java
index f828098..b020343 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/DependencyChecker.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/DependencyChecker.java
@@ -49,9 +49,8 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.slf4j.Logger;
import net.shibboleth.mvn.enforcer.impl.ParsedPom.DependencyPomArtifact;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
+import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.logic.Constraint;
/**
* Class to check that what we see is what we wanted in a build.
*/
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
index af4fc63..efc570a 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
@@ -52,9 +52,9 @@ import org.apache.maven.repository.RepositorySystem;
import org.slf4j.Logger;
import net.shibboleth.mvn.enforcer.impl.GPGKeyRing.Signature;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.XMLConstants;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.impl.BasicParserPool;
+import net.shibboleth.shared.xml.XMLConstants;
/** {@link EnforcerRule} implementation to check various
* things of interest about our distributions.
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/ParsedPom.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/ParsedPom.java
index 0ba07b0..eafdf45 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/ParsedPom.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/ParsedPom.java
@@ -39,11 +39,11 @@ import org.slf4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
+import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.shared.xml.ParserPool;
+import net.shibboleth.shared.xml.XMLParserException;
/**
* Object to represent a pom file (it also does the parsing).
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
index 8bba4e1..a392aca 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
@@ -38,8 +38,8 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import net.shibboleth.mvn.enforcer.impl.ParsedPom.DependencyPomArtifact;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.xml.ParserPool;
/**
* Representation of a project pom (including all the inherited stuff and child modules).
diff --git a/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCLI.java b/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCLI.java
index 23c2ae4..d07aeb2 100644
--- a/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCLI.java
+++ b/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCLI.java
@@ -46,7 +46,7 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.ext.spring.cli.AbstractCommandLine;
+import net.shibboleth.shared.cli.AbstractCommandLine;
/**
* Command Line to generate list keys in an KeyRing folder.
diff --git a/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCommandLineArguments.java b/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCommandLineArguments.java
index 35327ba..7cc048f 100644
--- a/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCommandLineArguments.java
+++ b/src/test/java/net/shibboleth/mvn/enforcer/cli/impl/ListKeysCommandLineArguments.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import com.beust.jcommander.Parameter;
-import net.shibboleth.ext.spring.cli.AbstractCommandLineArguments;
+import net.shibboleth.shared.cli.AbstractCommandLineArguments;
/**
* Command line arguments for Metadata Generation.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list