diff options
| author | Thomas <> | 2021-09-02 08:58:17 +0200 |
|---|---|---|
| committer | Thomas <> | 2021-09-02 08:58:17 +0200 |
| commit | 34094edfbf91cf445dbeae12b1b63cbfef543244 (patch) | |
| tree | 88e2bbd008a7fd9f3a425bbcfdb53cfac4e24079 /build_reporting/pom.xml | |
| parent | 847e690da4a2f6b08ca604538f1f42e6e6717d0b (diff) | |
| parent | e0a9aad4a321bae3b9c9afe7ea178d93b258749a (diff) | |
| download | National_eIDAS_Gateway-34094edfbf91cf445dbeae12b1b63cbfef543244.tar.gz National_eIDAS_Gateway-34094edfbf91cf445dbeae12b1b63cbfef543244.tar.bz2 National_eIDAS_Gateway-34094edfbf91cf445dbeae12b1b63cbfef543244.zip | |
Merge branch 'master' into feature/matching_rebased
# Conflicts:
# connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/utils/AuthenticationDataBuilderTest.java
# connector/src/test/resources/spring/SpringTest_connector.beans.xml
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskTest.java
# eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveAuthnResponseTaskTest.java
# pom.xml
Diffstat (limited to 'build_reporting/pom.xml')
| -rw-r--r-- | build_reporting/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_reporting/pom.xml b/build_reporting/pom.xml index eca57a03..c4bf9f83 100644 --- a/build_reporting/pom.xml +++ b/build_reporting/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>at.asitplus.eidas</groupId> <artifactId>ms_specific</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.2</version> </parent> <artifactId>build_reporting</artifactId> <packaging>pom</packaging> |