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 /connector/src/assembly | |
| 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 'connector/src/assembly')
| -rw-r--r-- | connector/src/assembly/assembly_dir.xml | 2 | ||||
| -rw-r--r-- | connector/src/assembly/assembly_zip.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/connector/src/assembly/assembly_dir.xml b/connector/src/assembly/assembly_dir.xml index 37e05390..59437be6 100644 --- a/connector/src/assembly/assembly_dir.xml +++ b/connector/src/assembly/assembly_dir.xml @@ -43,7 +43,9 @@ <includes> <!-- include>README.md</include--> <include>readme_${project.version}.txt</include> + <include>readme_${project.version}.md</include> <include>eIDAS_Ref_Impl/*</include> + <include>handbook/*</include> </includes> </fileSet> </fileSets> diff --git a/connector/src/assembly/assembly_zip.xml b/connector/src/assembly/assembly_zip.xml index 579da2e1..43877283 100644 --- a/connector/src/assembly/assembly_zip.xml +++ b/connector/src/assembly/assembly_zip.xml @@ -43,6 +43,9 @@ <includes> <!-- include>README.md</include --> <include>readme_${project.version}.txt</include> + <include>readme_${project.version}.md</include> + <include>eIDAS_Ref_Impl/*</include> + <include>handbook/*</include> </includes> </fileSet> </fileSets> |