Track upstream changes

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>11.1.0-SNAPSHOT</version>
+        <version>17.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.org.iay.incommon</groupId>
@@ -23,8 +23,7 @@
     <properties>
         <mda.version>0.10.0-SNAPSHOT</mda.version>
         <ukf-mda.version>0.10.0-SNAPSHOT</ukf-mda.version>
-        <java-support.version>8.0.0</java-support.version>
-        <spring-extensions.version>6.0.0</spring-extensions.version>
+        <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
         <checkstyle.version>7.6</checkstyle.version>
     </properties>
 
@@ -46,9 +45,9 @@
             <version>${mda.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.utilities</groupId>
-            <artifactId>java-support</artifactId>
-            <version>${java-support.version}</version>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-support</artifactId>
+            <version>${shib-shared.version}</version>
         </dependency>
 
         <!-- Provided Dependencies -->
@@ -58,9 +57,9 @@
         <!-- Test dependencies -->
 
         <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-            <version>${spring-extensions.version}</version>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-spring</artifactId>
+            <version>${shib-shared.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java

@@ -30,7 +30,7 @@
 import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthority;
 import net.shibboleth.metadata.pipeline.ItemOrderingStrategy;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
 
 /**
  * Implements an ordering strategy for InCommon federation aggregates.

src/main/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStage.java

@@ -26,9 +26,9 @@
 import net.shibboleth.metadata.dom.SimpleDOMTraversalContext;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.validate.Validator;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.xml.AttributeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
 import uk.org.iay.incommon.mda.validate.ValidatorSequence;
 
 /**

src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java

@@ -22,7 +22,7 @@
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.validate.BaseValidator;
 import net.shibboleth.metadata.validate.Validator;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
 
 /**
  * An abstract base class for {@link Validator} implementations which validate a value of

src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java

@@ -27,8 +27,8 @@
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.validate.BaseValidator;
 import net.shibboleth.metadata.validate.Validator;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
 
 /**
  * A {@link Validator} implementation which encapsulates the functionality of stepping

src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java

@@ -19,8 +19,8 @@
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.validate.BaseValidator;
 import net.shibboleth.metadata.validate.Validator;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.component.ComponentInitializationException;
 
 /**
  * A <code>Validator</code> that accepts a fixed {@link String} value.

src/main/java/uk/org/iay/incommon/mda/validate/string/BaseStringRegexValidator.java

@@ -19,9 +19,9 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.metadata.validate.BaseValidator;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentSupport;
 
 /**
  * A base class for <code>Validator</code>s that match {@link String} values against a regular expression.

src/test/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest.java

@@ -19,8 +19,8 @@
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.dom.DOMElementItem;
 import net.shibboleth.metadata.pipeline.Stage;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.shared.xml.AttributeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
 
 /**
  * A litmus test for {@link ScopeValidationStage} involving a set of valid and invalid

src/test/resources/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest-config.xml

@@ -10,7 +10,7 @@
 
     <import resource="classpath:uk/org/iay/incommon/mda/beans.xml"/>
 
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor"/>
+    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor"/>
 
     <bean id="litmusTest" parent="inc.stage_parent"
         class="uk.org.iay.incommon.mda.dom.saml.shib.ScopeValidationStage">