Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move pass-core-main test configuration #99

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Move pass-core-main test configuration #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ec0b17
Move pass-core test config
rpoet-jh Oct 30, 2024
98bec7d
Update pom parent version
rpoet-jh Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pass-core-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@
<artifactId>okhttp-urlconnection</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.pass</groupId>
<artifactId>pass-core-test-config</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 12 additions & 0 deletions pass-core-test-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.pass</groupId>
<artifactId>pass-core</artifactId>
<version>1.13.0-SNAPSHOT</version>
</parent>

<artifactId>pass-core-test-config</artifactId>

</project>
12 changes: 6 additions & 6 deletions ...n/src/test/resources/application-test.yml → ...g/src/main/resources/application-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ elide:
aggregation-store:
enabled: false

PASS_TEST_RESC_PATH: ${user.dir}/src/test/resources
PASS_SAML_PATH: "classpath:"

spring:
application:
Expand All @@ -28,16 +28,16 @@ spring:
entity-id: https://sp.pass/shibboleth
signing:
credentials:
- private-key-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-key.pem
certificate-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-cert.pem
- private-key-location: ${PASS_SAML_PATH}/saml2/sp-key.pem
certificate-location: ${PASS_SAML_PATH}/saml2/sp-cert.pem
decryption:
credentials:
- private-key-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-key.pem
certificate-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-cert.pem
- private-key-location: ${PASS_SAML_PATH}/saml2/sp-key.pem
certificate-location: ${PASS_SAML_PATH}/saml2/sp-cert.pem
acs:
location: "{baseUrl}/login/saml2/sso/{registrationId}"
assertingparty:
metadata-uri: file:${PASS_TEST_RESC_PATH}/saml2/idp-metadata.xml
metadata-uri: ${PASS_SAML_PATH}/saml2/idp-metadata.xml
user:
name: backend
password: moo
Expand Down
0 ...src/test/resources/saml2/idp-metadata.xml → ...src/main/resources/saml2/idp-metadata.xml
View file
Open in desktop
File renamed without changes.
0 ...main/src/test/resources/saml2/sp-cert.pem → ...nfig/src/main/resources/saml2/sp-cert.pem
View file
Open in desktop
File renamed without changes.
0 ...-main/src/test/resources/saml2/sp-key.pem → ...onfig/src/main/resources/saml2/sp-key.pem
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<module>pass-core-metadataschema-service</module>
<module>pass-core-policy-service</module>
<module>pass-core-usertoken</module>
<module>pass-core-test-config</module>
</modules>

<scm>
Expand Down Expand Up @@ -304,7 +305,9 @@
<ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-policy-service:</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-metadataschema-service:</ignoredUnusedDeclaredDependency>
<!-- These come from spring boot activemq artemis starter -->
<ignoredUsedUndeclaredDependency>org.apache.activemq:artemis-jakarta-server:</ignoredUsedUndeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.activemq:artemis-jakarta-server:</ignoredUnusedDeclaredDependency>
<!-- Used by ITs via classpath -->
<ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredNonTestScopedDependencies>
<!-- This is the elide starter jar -->
Expand Down
Loading