[java-shib-metadata] branch main updated: Update for java-shib-shared refactor.
Scott Cantor
cantor.2 at osu.edu
Wed Aug 31 14:07:43 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=82248aabc39051410c86e7adde6f47256a0b4e8e
The following commit(s) were added to refs/heads/main by this push:
new 82248aabc Update for java-shib-shared refactor.
82248aabc is described below
commit 82248aabc39051410c86e7adde6f47256a0b4e8e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 31 10:07:41 2022 -0400
Update for java-shib-shared refactor.
---
pom.xml | 21 ++++++++++++---------
shib-metadata-spring/pom.xml | 17 +++++++----------
.../spring/http/HTTPResourceConfigurationTests.java | 4 ++--
.../DynamicHTTPMetadataProviderParserTest.java | 2 +-
.../FileBackedHTTPMetadataProviderParserTest.java | 2 +-
.../spring/testing/AbstractFailFastTest.java | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 24815a632..fd5874a6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,11 @@
</modules>
<properties>
+ <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
<java-support.version>9.0.0-SNAPSHOT</java-support.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
- <spring-extensions.version>7.0.0-SNAPSHOT</spring-extensions.version>
+ <spring-extensions.version>9.0.0-SNAPSHOT</spring-extensions.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -101,6 +102,15 @@
<scope>import</scope>
</dependency>
+ <!-- Import Dependencies: Shared -->
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-shared-bom</artifactId>
+ <version>${shib-shared.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Compile Dependencies -->
<dependency>
@@ -113,7 +123,7 @@
<artifactId>spring-extensions</artifactId>
<version>${spring-extensions.version}</version>
</dependency>
-
+
<!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
@@ -126,13 +136,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/shib-metadata-spring/pom.xml b/shib-metadata-spring/pom.xml
index f95b2cf66..14f36b010 100644
--- a/shib-metadata-spring/pom.xml
+++ b/shib-metadata-spring/pom.xml
@@ -33,6 +33,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
@@ -110,16 +115,8 @@
</dependency>
<dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
index 054e4de32..9390e3dbf 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
@@ -32,9 +32,9 @@ import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import net.shibboleth.ext.spring.resource.HTTPResource;
-import net.shibboleth.ext.spring.testing.ResourceTestHelper;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.ResourceTestHelper;
/**
* This test mirrors the online documentation for the HTTPResource as well as the inline example in services.xml.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
index 2ea08c33e..986b99e33 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/DynamicHTTPMetadataProviderParserTest.java
@@ -44,7 +44,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
@SuppressWarnings("javadoc")
public class DynamicHTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
index 8d607f786..b81026c50 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/FileBackedHTTPMetadataProviderParserTest.java
@@ -29,7 +29,7 @@ import org.springframework.mock.env.MockPropertySource;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
@SuppressWarnings("javadoc")
public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
index 3dda78b53..e8449d00f 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
@@ -40,7 +40,7 @@ import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
/**
* Base class for testing metadata providers.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list