[java-opensaml] branch main updated: Update for java-shib-shared refactor.
Scott Cantor
cantor.2 at osu.edu
Wed Aug 31 14:08:18 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=b1b212715b2c7e77b430996208b56abbebc364f9
The following commit(s) were added to refs/heads/main by this push:
new b1b212715 Update for java-shib-shared refactor.
b1b212715 is described below
commit b1b212715b2c7e77b430996208b56abbebc364f9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 31 10:08:15 2022 -0400
Update for java-shib-shared refactor.
---
opensaml-messaging-impl/pom.xml | 4 ++++
opensaml-parent/pom.xml | 23 +++++++++++-----------
opensaml-profile-api/pom.xml | 10 ++++++++++
opensaml-saml-api/pom.xml | 5 +++++
opensaml-saml-impl/pom.xml | 14 +++++++++++++
.../resolver/filter/impl/EntityRoleFilterTest.java | 2 +-
.../impl/FileBackedHTTPMetadataResolverTest.java | 2 +-
...ctionDrivenDynamicHTTPMetadataResolverTest.java | 4 ++--
.../resolver/impl/HTTPMetadataResolverTest.java | 2 +-
.../impl/TemplateRequestURLBuilderTest.java | 2 +-
opensaml-security-api/pom.xml | 18 ++++++++++-------
.../SecurityEnhancedHTTPResourceTest.java | 14 ++++++-------
opensaml-soap-impl/pom.xml | 5 +++++
opensaml-storage-impl/pom.xml | 16 +++++++++++++++
.../AbstractBaseClientStorageServiceTest.java | 6 +++---
opensaml-xmlsec-impl/pom.xml | 8 +++-----
.../support/tests/DetachedSignatureTest.java | 2 +-
17 files changed, 97 insertions(+), 40 deletions(-)
diff --git a/opensaml-messaging-impl/pom.xml b/opensaml-messaging-impl/pom.xml
index 2e74e2c48..c174ba437 100644
--- a/opensaml-messaging-impl/pom.xml
+++ b/opensaml-messaging-impl/pom.xml
@@ -32,6 +32,10 @@
<artifactId>opensaml-messaging-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git a/opensaml-parent/pom.xml b/opensaml-parent/pom.xml
index a6549679f..d40be7826 100644
--- a/opensaml-parent/pom.xml
+++ b/opensaml-parent/pom.xml
@@ -55,8 +55,7 @@
</modules>
<properties>
- <java-support.version>9.0.0-SNAPSHOT</java-support.version>
- <spring-extensions.version>7.0.0-SNAPSHOT</spring-extensions.version>
+ <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
<checkstyle.configLocation>${project.basedir}/../opensaml-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<opensaml-parent.site.url>${shibboleth.site.deploy.url}java-opensaml/${project.version}/</opensaml-parent.site.url>
<opensaml-module.site.url>${opensaml-parent.site.url}${project.artifactId}</opensaml-module.site.url>
@@ -89,7 +88,7 @@
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
- <version>${java-support.version}</version>
+ <version>${shib-shared.version}</version>
</dependency>
<!-- Provided Dependencies -->
@@ -97,13 +96,6 @@
<!-- Runtime Dependencies -->
<!-- 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.testng</groupId>
<artifactId>testng</artifactId>
@@ -132,6 +124,15 @@
used by all project modules. -->
<dependencyManagement>
<dependencies>
+ <!-- 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>
<groupId>net.spy</groupId>
@@ -147,7 +148,7 @@
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
+ <version>${shib-shared.version}</version>
<scope>test</scope>
</dependency>
diff --git a/opensaml-profile-api/pom.xml b/opensaml-profile-api/pom.xml
index a91c1a427..a30f37a1f 100644
--- a/opensaml-profile-api/pom.xml
+++ b/opensaml-profile-api/pom.xml
@@ -32,6 +32,16 @@
<artifactId>opensaml-messaging-api</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git a/opensaml-saml-api/pom.xml b/opensaml-saml-api/pom.xml
index 14c1cf9f5..1b2dabd7b 100644
--- a/opensaml-saml-api/pom.xml
+++ b/opensaml-saml-api/pom.xml
@@ -58,6 +58,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/opensaml-saml-impl/pom.xml b/opensaml-saml-impl/pom.xml
index 1ed5880d3..3eb532089 100644
--- a/opensaml-saml-impl/pom.xml
+++ b/opensaml-saml-impl/pom.xml
@@ -88,6 +88,15 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -207,6 +216,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
index f363d147d..d7b94fe9b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
@@ -35,7 +35,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
/**
* Unit tests for {@link EntityRoleFilter}.
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index a9b965c28..59dda78f4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -45,7 +45,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index a898b2e78..3e368618f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -40,8 +40,8 @@ import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
-import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.VelocityEngine;
public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index d114e9745..934297535 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -54,7 +54,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
/**
* Unit tests for {@link HTTPMetadataResolver}.
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilderTest.java
index 49bbdd078..17680df50 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/TemplateRequestURLBuilderTest.java
@@ -37,7 +37,7 @@ public class TemplateRequestURLBuilderTest {
@BeforeClass
public void setUp() {
- engine = net.shibboleth.utilities.java.support.velocity.VelocityEngine.newVelocityEngine();
+ engine = net.shibboleth.utilities.java.support.testing.VelocityEngine.newVelocityEngine();
}
@Test
diff --git a/opensaml-security-api/pom.xml b/opensaml-security-api/pom.xml
index 9b1325670..05f36827f 100644
--- a/opensaml-security-api/pom.xml
+++ b/opensaml-security-api/pom.xml
@@ -34,6 +34,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -84,6 +89,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
@@ -105,13 +116,6 @@
<artifactId>spring-extensions</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<scm>
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
index bea2d74b7..71af532bd 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
@@ -24,10 +24,10 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
import net.shibboleth.ext.spring.resource.HTTPResource;
-import net.shibboleth.ext.spring.testing.ResourceTestHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-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;
import org.apache.http.client.HttpClient;
import org.springframework.core.io.ClassPathResource;
@@ -41,10 +41,10 @@ import org.testng.annotations.Test;
*/
public class SecurityEnhancedHTTPResourceTest {
- private final String path = "net/shibboleth/ext/spring/resource/document.xml";
- private final String pathPrefix = "src/test/resources/";
- private final String existsHttps = RepositorySupport.buildHTTPSResourceURL("spring-extensions", pathPrefix+ path);
- private final String existsHttp = RepositorySupport.buildHTTPResourceURL("spring-extensions", pathPrefix+ path, false);
+ private final String path = "data/org/opensaml/security/httpclient/document.xml";
+ private final String pathPrefix = "opensaml-security-api/src/test/resources/";
+ private final String existsHttps = RepositorySupport.buildHTTPSResourceURL("java-opensaml", pathPrefix+ path);
+ private final String existsHttp = RepositorySupport.buildHTTPResourceURL("java-opensaml", pathPrefix+ path, false);
private HttpClient client;
private HttpClientSecurityParameters params;
@@ -65,7 +65,7 @@ public class SecurityEnhancedHTTPResourceTest {
final HTTPResource existsResource = new HTTPResource(client, existsHttp);
existsResource.setHttpClientContextHandler(handler);
- Assert.assertTrue(ResourceTestHelper.compare(existsResource, new ClassPathResource("net/shibboleth/ext/spring/resource/document.xml")));
+ Assert.assertTrue(ResourceTestHelper.compare(existsResource, new ClassPathResource(path)));
}
@Test public void testHostnameRejected() throws IOException, ComponentInitializationException {
diff --git a/opensaml-soap-impl/pom.xml b/opensaml-soap-impl/pom.xml
index b00b5e0db..782326076 100644
--- a/opensaml-soap-impl/pom.xml
+++ b/opensaml-soap-impl/pom.xml
@@ -52,6 +52,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git a/opensaml-storage-impl/pom.xml b/opensaml-storage-impl/pom.xml
index 45980a700..951fd7a89 100644
--- a/opensaml-storage-impl/pom.xml
+++ b/opensaml-storage-impl/pom.xml
@@ -40,6 +40,16 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
@@ -104,6 +114,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/AbstractBaseClientStorageServiceTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/AbstractBaseClientStorageServiceTest.java
index 0fddd2998..326346f1d 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/AbstractBaseClientStorageServiceTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/client/AbstractBaseClientStorageServiceTest.java
@@ -20,6 +20,7 @@ package org.opensaml.storage.impl.client;
import org.springframework.core.io.ClassPathResource;
import org.testng.Assert;
+import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.CookieManager;
import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestSupplier;
@@ -27,7 +28,6 @@ import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseS
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
-import net.shibboleth.utilities.java.support.test.resource.TestResourceConverter;
/** Base class for client storage tests. */
public class AbstractBaseClientStorageServiceTest {
@@ -40,11 +40,11 @@ public class AbstractBaseClientStorageServiceTest {
protected void init() throws ComponentInitializationException {
ClassPathResource resource = new ClassPathResource("/org/opensaml/storage/impl/SealerKeyStore.jks");
Assert.assertTrue(resource.exists());
- keystoreResource = TestResourceConverter.of(resource);
+ keystoreResource = ResourceHelper.of(resource);
resource = new ClassPathResource("/org/opensaml/storage/impl/SealerKeyStore.kver");
Assert.assertTrue(resource.exists());
- versionResource = TestResourceConverter.of(resource);
+ versionResource = ResourceHelper.of(resource);
}
protected ClientStorageService getStorageService() throws ComponentInitializationException {
diff --git a/opensaml-xmlsec-impl/pom.xml b/opensaml-xmlsec-impl/pom.xml
index 64be841fd..8bde2f5f0 100644
--- a/opensaml-xmlsec-impl/pom.xml
+++ b/opensaml-xmlsec-impl/pom.xml
@@ -85,12 +85,10 @@
<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>
+ <groupId>net.shibboleth.shared</groupId>
+ <artifactId>shib-testing</artifactId>
<scope>test</scope>
</dependency>
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
index 9c98e433b..adb1ce3ea 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/tests/DetachedSignatureTest.java
@@ -47,7 +47,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.test.repository.RepositorySupport;
+import net.shibboleth.utilities.java.support.testing.RepositorySupport;
import net.shibboleth.utilities.java.support.xml.BasicParserPool;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list