aboutsummaryrefslogtreecommitdiff
path: root/connector/src/assembly
diff options
context:
space:
mode:
authorThomas <>2022-04-05 09:14:17 +0200
committerThomas <>2022-04-05 09:14:17 +0200
commit9d1e1294c2825c6f9a422c9f9c51f9965258d19e (patch)
tree489c11343c4911cfda0a78974bdb51724c264f47 /connector/src/assembly
parentecc1dd834c5af467a5aa0f77e5dc6d986c6af418 (diff)
parent791dc8acd7edbf22b98c2be111d420e61ebb39e6 (diff)
downloadNational_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.tar.gz
National_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.tar.bz2
National_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.zip
Merge branch 'master' into nightlybuild
# Conflicts: # build_reporting/pom.xml # connector/pom.xml # infos/history.txt # infos/readme_1.2.4.md # modules/authmodule-eIDAS-v2/pom.xml # modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java # modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java # modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java # modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java # modules/core_common_lib/pom.xml # modules/pom.xml # pom.xml
Diffstat (limited to 'connector/src/assembly')
-rw-r--r--connector/src/assembly/assembly_dir.xml1
-rw-r--r--connector/src/assembly/assembly_zip.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/connector/src/assembly/assembly_dir.xml b/connector/src/assembly/assembly_dir.xml
index 59437be6..bc12a470 100644
--- a/connector/src/assembly/assembly_dir.xml
+++ b/connector/src/assembly/assembly_dir.xml
@@ -44,6 +44,7 @@
<!-- include>README.md</include-->
<include>readme_${project.version}.txt</include>
<include>readme_${project.version}.md</include>
+ <include>history.txt</include>
<include>eIDAS_Ref_Impl/*</include>
<include>handbook/*</include>
</includes>
diff --git a/connector/src/assembly/assembly_zip.xml b/connector/src/assembly/assembly_zip.xml
index 43877283..dcb7dab0 100644
--- a/connector/src/assembly/assembly_zip.xml
+++ b/connector/src/assembly/assembly_zip.xml
@@ -44,6 +44,7 @@
<!-- include>README.md</include -->
<include>readme_${project.version}.txt</include>
<include>readme_${project.version}.md</include>
+ <include>history.txt</include>
<include>eIDAS_Ref_Impl/*</include>
<include>handbook/*</include>
</includes>