diff --git a/pom.xml b/pom.xml index a09b8b137802b0d8aba001e3e7130a570f531664..50532fcf9816700390290c26ea40a216018cb19d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>de.ozgcloud.common</groupId> - <artifactId>ozgcloud-common-parent</artifactId> - <version>3.0.1</version> - <relativePath/> - </parent> + <parent> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-parent</artifactId> + <version>4.0.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>de.ozgcloud.nachrichten</groupId> + <groupId>de.ozgcloud.nachrichten</groupId> <artifactId>nachrichten-manager</artifactId> <version>2.6.0-SNAPSHOT</version> <name>OZG-Cloud Nachrichten Manager</name> @@ -42,7 +42,7 @@ <ozgcloud.license.version>1.3.0</ozgcloud.license.version> <jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version> <ozg-info-manager-interface.version>0.10.0-22.8503e49-20240124.071709-1</ozg-info-manager-interface.version> - <bayernid-proxy-interface.version>0.1.0-SNAPSHOT</bayernid-proxy-interface.version> + <bayernid-proxy-interface.version>0.1.0</bayernid-proxy-interface.version> <opensaml.version>4.3.0</opensaml.version> </properties> diff --git a/src/main/resources/application-bayern.yaml b/src/main/resources/application-bayern.yaml index 898a6a6d7a85c34656f5ba0a34611a10025f4962..f8fcba293cb9f21fd400b4f86a3c0320c0fa6aa3 100644 --- a/src/main/resources/application-bayern.yaml +++ b/src/main/resources/application-bayern.yaml @@ -1,7 +1,3 @@ ozgcloud: antragraum: - url: https://dev.antragsraum.de/ - entityId: https://antragsraum.ozgcloud.de/ - metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" - decryptionPrivateKey: "classpath:/bayernid/bayernid-test-enc.key" - decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt" \ No newline at end of file + entityId: https://antragsraum.ozgcloud.de/ \ No newline at end of file diff --git a/src/main/resources/application-bayernlocal.yaml b/src/main/resources/application-bayernlocal.yaml new file mode 100644 index 0000000000000000000000000000000000000000..898a6a6d7a85c34656f5ba0a34611a10025f4962 --- /dev/null +++ b/src/main/resources/application-bayernlocal.yaml @@ -0,0 +1,7 @@ +ozgcloud: + antragraum: + url: https://dev.antragsraum.de/ + entityId: https://antragsraum.ozgcloud.de/ + metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + decryptionPrivateKey: "classpath:/bayernid/bayernid-test-enc.key" + decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt" \ No newline at end of file diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml index 329aba1ddb082512852ba36fed08134247826cb9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/test/resources/application.yaml +++ b/src/test/resources/application.yaml @@ -1,11 +0,0 @@ -ozgcloud: - bayernid: - saml: - entity-id: https://antragsraum.ozgcloud.de/ - metadata-uri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" - decryption: - private-key-location: "classpath:/bayernid/bayernid-test-enc.key" - certificate-location: "classpath:/bayernid/bayernid-test-enc.crt" -logging: - level: - "org.opensaml.xmlsec.signature": debug \ No newline at end of file