[java-shib-profile] branch main updated: Dependency cleanup and annotation fix.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-profile.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=8ff2cb37064383935d23ed2f27bd91a68e65e712

The following commit(s) were added to refs/heads/main by this push:
     new 8ff2cb3  Dependency cleanup and annotation fix.
8ff2cb3 is described below

commit 8ff2cb37064383935d23ed2f27bd91a68e65e712
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 14 08:41:08 2023 -0500

    Dependency cleanup and annotation fix.
---
 shib-profile-api/pom.xml                           | 34 +---------------------
 .../relyingparty/VerifiedProfileCriterion.java     |  4 +--
 shib-profile-impl/pom.xml                          | 34 ++++++----------------
 shib-profile-testing/pom.xml                       | 34 +---------------------
 4 files changed, 12 insertions(+), 94 deletions(-)

diff --git a/shib-profile-api/pom.xml b/shib-profile-api/pom.xml
index 9577357..e5c8f2c 100644
--- a/shib-profile-api/pom.xml
+++ b/shib-profile-api/pom.xml
@@ -22,10 +22,6 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-profile-api</artifactId>
@@ -36,42 +32,14 @@
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-spring</artifactId>
+            <artifactId>opensaml-security-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
index 6de30d1..fd8e826 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/VerifiedProfileCriterion.java
@@ -17,8 +17,6 @@
 
 package net.shibboleth.profile.relyingparty;
 
-import javax.annotation.Nonnull;
-
 import net.shibboleth.shared.resolver.Criterion;
 
 /**
@@ -30,7 +28,7 @@ import net.shibboleth.shared.resolver.Criterion;
 public final class VerifiedProfileCriterion implements Criterion {
 
     /** Verified flag. */
-    @Nonnull private final boolean verified;
+    private final boolean verified;
 
     /**
      * Constructor.
diff --git a/shib-profile-impl/pom.xml b/shib-profile-impl/pom.xml
index bf13f73..595f6fc 100644
--- a/shib-profile-impl/pom.xml
+++ b/shib-profile-impl/pom.xml
@@ -36,38 +36,27 @@
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-beans</artifactId>
+            <artifactId>opensaml-core-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context</artifactId>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-api</artifactId>
         </dependency>
-        
         <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-service</artifactId>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-security-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
         </dependency>
         
         <!-- Provided Dependencies -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Runtime Dependencies -->
 
@@ -78,11 +67,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 
diff --git a/shib-profile-testing/pom.xml b/shib-profile-testing/pom.xml
index 9ab4a6e..e058f17 100644
--- a/shib-profile-testing/pom.xml
+++ b/shib-profile-testing/pom.xml
@@ -30,42 +30,10 @@
         
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-profile-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-messaging-api</artifactId>
+            <artifactId>opensaml-security-api</artifactId>
         </dependency>
 
         <!-- Normally test scope. -->
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-testing</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${shib-shared.groupId}</groupId>
-            <artifactId>shib-testing</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
 
         <!-- Provided Dependencies -->
 

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