[java-shib-metadata] branch main updated: Move one test class into testing module.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 20 15:02:42 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=dbd6e07e4e99ab4f1a4c7edf1a13802f6d09c2fd
The following commit(s) were added to refs/heads/main by this push:
new dbd6e07e4 Move one test class into testing module.
dbd6e07e4 is described below
commit dbd6e07e4e99ab4f1a4c7edf1a13802f6d09c2fd
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 20 11:02:39 2022 -0400
Move one test class into testing module.
---
pom.xml | 3 +-
shib-metadata-bom/pom.xml | 7 ++
shib-metadata-spring/pom.xml | 7 ++
shib-metadata-testing/.checkstyle | 15 ++++
shib-metadata-testing/pom.xml | 82 ++++++++++++++++++++++
.../spring/testing/AbstractFailFastTest.java | 0
.../shibboleth/spring/testing/package-info.java | 0
shib-metadata-tests-bom/.gitignore | 1 -
shib-metadata-tests-bom/pom.xml | 44 ------------
9 files changed, 113 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c250b75c..e85704baa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,9 @@
<module>shib-metadata-impl</module>
<module>shib-metadata-spring</module>
+ <module>shib-metadata-testing</module>
+
<module>shib-metadata-bom</module>
- <module>shib-metadata-tests-bom</module>
</modules>
<properties>
diff --git a/shib-metadata-bom/pom.xml b/shib-metadata-bom/pom.xml
index 0da22892a..a4e5bac48 100644
--- a/shib-metadata-bom/pom.xml
+++ b/shib-metadata-bom/pom.xml
@@ -32,6 +32,13 @@
<artifactId>shib-metadata-spring</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-metadata-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/shib-metadata-spring/pom.xml b/shib-metadata-spring/pom.xml
index 19e879ce0..2889a4341 100644
--- a/shib-metadata-spring/pom.xml
+++ b/shib-metadata-spring/pom.xml
@@ -105,6 +105,13 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-metadata-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-testing</artifactId>
diff --git a/shib-metadata-testing/.checkstyle b/shib-metadata-testing/.checkstyle
new file mode 100644
index 000000000..858c808d7
--- /dev/null
+++ b/shib-metadata-testing/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+ <local-check-config name="Shibboleth Checkstyle" location="/java-shib-metadata/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
+
+</fileset-config>
diff --git a/shib-metadata-testing/pom.xml b/shib-metadata-testing/pom.xml
new file mode 100644
index 000000000..463ee616a
--- /dev/null
+++ b/shib-metadata-testing/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-metadata-parent</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Shibboleth Metadata :: Testing</name>
+ <description>Shibboleth Metadata Testing API</description>
+ <artifactId>shib-metadata-testing</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.metadata.api</automatic.module.name>
+ </properties>
+
+ <dependencies>
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <!-- Normally test scope. -->
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+
+ <!-- Runtime Dependencies -->
+
+ <!-- Test Dependencies -->
+
+ <!-- Needed to register various SAML XMLObject providers. -->
+ </dependencies>
+
+</project>
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
similarity index 100%
rename from shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
rename to shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/AbstractFailFastTest.java
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/package-info.java b/shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/package-info.java
similarity index 100%
rename from shib-metadata-spring/src/test/java/net/shibboleth/spring/testing/package-info.java
rename to shib-metadata-testing/src/main/java/net/shibboleth/spring/testing/package-info.java
diff --git a/shib-metadata-tests-bom/.gitignore b/shib-metadata-tests-bom/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/shib-metadata-tests-bom/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/shib-metadata-tests-bom/pom.xml b/shib-metadata-tests-bom/pom.xml
deleted file mode 100644
index 20f02a55f..000000000
--- a/shib-metadata-tests-bom/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-metadata-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- </parent>
-
- <name>Shibboleth Metadata :: Tests BOM</name>
- <description>Bill of Materials</description>
- <artifactId>shib-metadata-tests-bom</artifactId>
- <packaging>pom</packaging>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-metadata-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-metadata-spring</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list