[java-idp-integration-tests] 01/04: Change idp-conf dependency to idp-conf-impl

[Tom Zeller]

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=8ead41ae23d3d1cafb371350a3bd198322c30fb5

commit 8ead41ae23d3d1cafb371350a3bd198322c30fb5
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed May 17 17:27:32 2023 -0500

    Change idp-conf dependency to idp-conf-impl
---
 pom.xml | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0055f1b..4908603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
             <artifactId>idp-conf-impl</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <version>${idp.version}</version>
         </dependency>
         <dependency>
             <groupId>net.shibboleth.idp</groupId>
@@ -173,7 +174,7 @@
                             <outputDirectory>${test-distributions.directory}</outputDirectory>
                         </configuration>
                     </execution>
-                    <!-- Unpack test credentials from idp-conf test jar. -->
+                    <!-- Unpack test credentials from idp-conf-impl test jar. -->
                     <execution>
                         <id>unpack-idp-conf-test-credentials</id>
                         <phase>compile</phase>
@@ -184,18 +185,42 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>net.shibboleth.idp</groupId>
-                                    <artifactId>idp-conf</artifactId>
+                                    <artifactId>idp-conf-impl</artifactId>
                                     <version>${idp-to-be-tested.version}</version>
                                     <type>test-jar</type>
                                     <classifier>tests</classifier>
-                                    <includes>**/credentials/*</includes>
-                                    <excludes>**/credentials/idp-userfacing.p12</excludes>
+                                    <includes>credentials/*</includes>
+                                    <excludes>credentials/idp-userfacing.p12</excludes>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${idp-to-be-tested.directory}</outputDirectory>
                         </configuration>
                     </execution>
-                    <!-- Copy test flows from idp-conf test jar. -->
+                    <!-- Unpack ldap certificate from idp-conf-impl test jar. -->
+                    <execution>
+                        <id>unpack-idp-conf-test-credentials-ldap</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.shibboleth.idp</groupId>
+                                    <artifactId>idp-conf-impl</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>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${idp-to-be-tested.directory}/credentials</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <!-- Copy test flows from idp-conf-impl test jar. -->
                     <execution>
                         <id>unpack-idp-conf-test-flows</id>
                         <phase>compile</phase>
@@ -206,7 +231,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>net.shibboleth.idp</groupId>
-                                    <artifactId>idp-conf</artifactId>
+                                    <artifactId>idp-conf-impl</artifactId>
                                     <version>${idp-to-be-tested.version}</version>
                                     <type>test-jar</type>
                                     <classifier>tests</classifier>
@@ -216,7 +241,7 @@
                             <outputDirectory>${idp-to-be-tested.directory}</outputDirectory>
                         </configuration>
                     </execution>
-                    <!-- Copy example metadata from idp-conf test jar. -->
+                    <!-- Copy example metadata from idp-conf-impl test jar. -->
                     <execution>
                         <id>unpack-idp-conf-example-metadata</id>
                         <phase>compile</phase>
@@ -227,7 +252,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>net.shibboleth.idp</groupId>
-                                    <artifactId>idp-conf</artifactId>
+                                    <artifactId>idp-conf-impl</artifactId>
                                     <version>${idp-to-be-tested.version}</version>
                                     <type>test-jar</type>
                                     <classifier>tests</classifier>
@@ -384,7 +409,7 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>net.shibboleth.idp</groupId>
-                                            <artifactId>idp-conf</artifactId>
+                                            <artifactId>idp-conf-impl</artifactId>
                                             <version>${idp-to-be-tested.version}</version>
                                             <type>jar</type>
                                             <classifier>tests</classifier>
@@ -519,7 +544,7 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>net.shibboleth.idp</groupId>
-                                            <artifactId>idp-conf</artifactId>
+                                            <artifactId>idp-conf-impl</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.