[java-idp-integration-tests] 02/03: Support testing IdP V4 again
Tom Zeller
tzeller at dragonacea.biz
Thu May 18 23:52:58 UTC 2023
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch main
in repository java-idp-integration-tests.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=cee68214da846681c8798ba05b97d0fb6f0b515b
commit cee68214da846681c8798ba05b97d0fb6f0b515b
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu May 18 18:52:08 2023 -0500
Support testing IdP V4 again
Add 'idp-4' Maven profile.
Parameterize the artifactId of the idp-conf (V4) or idp-conf-impl (V5)
test JAR from which test resources are extracted.
---
pom.xml | 42 +++++++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1160321..a32e469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,8 @@
<test-distributions.directory>${project.basedir}/test-distributions</test-distributions.directory>
<idp-to-be-tested.directory>${test-distributions.directory}/shibboleth-identity-provider-${idp-to-be-tested.version}</idp-to-be-tested.directory>
<svn.relative.location>java-idp-integration-tests</svn.relative.location>
+
+ <idp-conf.artifactId>idp-conf-impl</idp-conf.artifactId>
</properties>
<dependencyManagement>
@@ -143,7 +145,7 @@
<outputDirectory>${test-distributions.directory}</outputDirectory>
</configuration>
</execution>
- <!-- Unpack test credentials from idp-conf-impl test jar. -->
+ <!-- Unpack test credentials from idp-conf-impl or idp-conf test jar. -->
<execution>
<id>unpack-idp-conf-test-credentials</id>
<phase>compile</phase>
@@ -154,7 +156,7 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
@@ -165,7 +167,7 @@
<outputDirectory>${idp-to-be-tested.directory}</outputDirectory>
</configuration>
</execution>
- <!-- Unpack ldap certificate from idp-conf-impl test jar. -->
+ <!-- Unpack ldap certificate from idp-conf-impl or idp-conf test jar. -->
<execution>
<id>unpack-idp-conf-test-credentials-ldap</id>
<phase>compile</phase>
@@ -176,11 +178,11 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
- <includes>net/shibboleth/idp/module/credentials/ldap-server.crt</includes>
+ <includes>**/credentials/ldap-server.crt</includes>
<fileMappers>
<org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
</fileMappers>
@@ -189,7 +191,7 @@
<outputDirectory>${idp-to-be-tested.directory}/credentials</outputDirectory>
</configuration>
</execution>
- <!-- Copy test flows from idp-conf-impl test jar. -->
+ <!-- Copy test flows from idp-conf-impl or idp-conf test jar. -->
<execution>
<id>unpack-idp-conf-test-flows</id>
<phase>compile</phase>
@@ -200,7 +202,7 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
@@ -210,7 +212,7 @@
<outputDirectory>${idp-to-be-tested.directory}</outputDirectory>
</configuration>
</execution>
- <!-- Copy example metadata from idp-conf-impl test jar. -->
+ <!-- Copy example metadata from idp-conf-impl or idp-conf test jar. -->
<execution>
<id>unpack-idp-conf-example-metadata</id>
<phase>compile</phase>
@@ -221,7 +223,7 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>test-jar</type>
<classifier>tests</classifier>
@@ -289,6 +291,20 @@
</build>
<profiles>
+ <!--
+ The idp-4 profile tests IdP V4.
+ -->
+ <profile>
+ <id>idp-4</id>
+ <properties>
+ <idp-to-be-tested.version>4.3.1</idp-to-be-tested.version>
+ <idp-conf.artifactId>idp-conf</idp-conf.artifactId>
+ <idp-jetty-base.version>10.0.0-SNAPSHOT</idp-jetty-base.version>
+ <jetty.version>10.0.15</jetty.version>
+ <testbed.version>0.8.0-SNAPSHOT</testbed.version>
+ </properties>
+ </profile>
+
<!--
The jetty profile unpacks Jetty, idp-jetty-base, and adds the testbed to Jetty.
The jetty profile is active by default and not active if the 'tomcat' system property is present.
@@ -367,7 +383,7 @@
<outputDirectory>${test-distributions.directory}</outputDirectory>
</configuration>
</execution>
- <!-- Copy credentials to jetty-base. -->
+ <!-- Copy credentials from idp-conf-impl or idp-conf test jar to jetty-base. -->
<execution>
<id>copy-credentials-to-jetty-base</id>
<phase>compile</phase>
@@ -378,7 +394,7 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>jar</type>
<classifier>tests</classifier>
@@ -502,7 +518,7 @@
<outputDirectory>${test-distributions.directory}/tomcat-base/</outputDirectory>
</configuration>
</execution>
- <!-- Copy credentials to tomcat-base. -->
+ <!-- Copy credentials from idp-conf-impl or idp-conf test jar to tomcat-base. -->
<execution>
<id>copy-credentials-to-tomcat-base</id>
<phase>compile</phase>
@@ -513,7 +529,7 @@
<artifactItems>
<artifactItem>
<groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-conf-impl</artifactId>
+ <artifactId>${idp-conf.artifactId}</artifactId>
<version>${idp-to-be-tested.version}</version>
<type>jar</type>
<classifier>tests</classifier>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list