From c3aa73a61e37e65545a18169b54d0360f964f273 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 22 Apr 2021 12:28:56 +0200 Subject: add new assembly process --- assembly/pom.xml | 164 +++++++++++++++++++++ .../src/main/resources/assembly_auth_edu_v2.xml | 117 +++++++++++++++ .../src/main/resources/assembly_auth_final_v2.xml | 117 +++++++++++++++ .../resources/data/endorsed/xml-api-iaik-1.1.jar | Bin 0 -> 356097 bytes .../resources/data/ext/iaik_Pkcs11Provider.jar | Bin 0 -> 350831 bytes .../main/resources/data/ext/iaik_Pkcs11Wrapper.jar | Bin 0 -> 271088 bytes .../data/pkcs11/linux/libpkcs11wrapper.so | Bin 0 -> 120041 bytes .../data/pkcs11/solaris_sparc/libpkcs11wrapper.so | Bin 0 -> 159280 bytes .../pkcs11/solaris_sparcv9/libpkcs11wrapper.so | Bin 0 -> 219768 bytes .../resources/data/pkcs11/win32/pkcs11wrapper.dll | Bin 0 -> 91136 bytes .../resources/data/pkcs11/win64/pkcs11wrapper.dll | Bin 0 -> 104960 bytes 11 files changed, 398 insertions(+) create mode 100644 assembly/pom.xml create mode 100644 assembly/src/main/resources/assembly_auth_edu_v2.xml create mode 100644 assembly/src/main/resources/assembly_auth_final_v2.xml create mode 100644 assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar create mode 100644 assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar create mode 100644 assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar create mode 100644 assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so create mode 100644 assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so create mode 100644 assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so create mode 100644 assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll create mode 100644 assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml new file mode 100644 index 000000000..7a4d88ad3 --- /dev/null +++ b/assembly/pom.xml @@ -0,0 +1,164 @@ + + + + MOA + MOA + 4.1.6-SNAPSHOT + + + 4.0.0 + id-assembly + pom + MOA-ID Release Assembly + + + + + + src/main/resources + + + + + + + org.jacoco + jacoco-maven-plugin + + + + aggregate-reports-ut + test + + report-aggregate + + + Maven Multimodule Coverage Demo: Coverage of Unit Tests + ${project.reporting.outputDirectory}/jacoco-aggregate-ut + + + **/target/jacoco-it.exec + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + src/main/resources/assembly_auth_final_v2.xml + src/main/resources/assembly_auth_edu_v2.xml + + moa-id-${project.version} + ${project.parent.build.directory} + + + + make-assembly + package + + single + + + + + + + + + + MOA.id + moa-id-configuration + ${configtool-version} + war + + + MOA.id + moa-id-oa + ${demo-oa-version} + war + + + MOA.id.server + moa-id-auth-final + ${moa-id-version-final} + war + + + MOA.id.server + moa-id-auth-edu + ${moa-id-version-edu} + war + + + + MOA.id.server.modules + moa-id-module-monitoring + + + + + MOA.id.server.modules + moa-id-module-saml1 + + + + MOA.id.server.modules + moa-id-module-openID + + + + MOA.id.server.modules + moa-id-module-elga_mandate_service + + + + MOA.id.server.modules + moa-id-modul-citizencard_authentication + + + + MOA.id.server.modules + moa-id-modules-federated_authentication + + + + MOA.id.server.modules + moa-id-module-ssoTransfer + ${moa-id-version} + + + + MOA.id.server.modules + moa-id-module-bkaMobilaAuthSAML2Test + + + + MOA.id.server.modules + moa-id-module-sl20_authentication + + + + MOA.id.server.modules + moa-id-module-AT_eIDAS_connector + + + + MOA.id.server.modules + moa-id-module-EID_connector + + + + MOA.id + moa-id-webgui + 1.0 + + + + + diff --git a/assembly/src/main/resources/assembly_auth_edu_v2.xml b/assembly/src/main/resources/assembly_auth_edu_v2.xml new file mode 100644 index 000000000..36ced7e3d --- /dev/null +++ b/assembly/src/main/resources/assembly_auth_edu_v2.xml @@ -0,0 +1,117 @@ + + + dist-edu + + zip + + false + moa-id-auth-edu-${moa-id-version} + + + + + ${project.parent.basedir}/id/ConfigWebTool/target/ + ./ + + *.war + + + + ${project.parent.basedir}/id/oa/target + ./ + + *.war + + + + ${project.parent.basedir}/id/server/auth-edu/target + ./ + + *.war + + + + + + ${project.parent.basedir}/id/ + ./ + + readme_${project.version}.txt + history.txt + + + + ${project.parent.basedir}/ + ./ + + EUPL v.1.1 - Licence.pdf + IAIK-LICENSE.txt + LICENSE-2.0.txt + NOTICE.txt + SIC_LICENSE.txt + + + + ${project.parent.basedir}/id/server/data/deploy/conf/ + ./conf + + Catalina/** + moa-id-proxy/** + + + + ${project.parent.basedir}/id/server/data/deploy/conf/ + ./doc/conf + + Catalina/** + moa-id-proxy/** + + + + ${project.parent.basedir}/id/server/doc/handbook/ + ./doc/handbook + + + ${project.parent.basedir}/id/server/data/deploy/tomcat/ + ./tomcat + + + + + ${project.basedir}/src/main/resources/data/pkcs11/ + ./pkcs11 + + + + ${project.basedir}/src/main/resources/data/endorsed/ + ./endorsed + + + ${project.parent.basedir}/id/server/auth-edu/target/moa-id-auth-edu-${moa-id-version}/WEB-INF/lib/ + ./endorsed + + serializer*.jar + xalan*.jar + xercesImpl*.jar + + + + + ${project.basedir}/src/main/resources/data/ext/ + ./ext + + + ${project.parent.basedir}/id/server/auth-edu/target/moa-id-auth-edu-${moa-id-version}/WEB-INF/lib/ + ./ext + + iaik_jce_full*.jar + + + + + + + + diff --git a/assembly/src/main/resources/assembly_auth_final_v2.xml b/assembly/src/main/resources/assembly_auth_final_v2.xml new file mode 100644 index 000000000..9e07a45ae --- /dev/null +++ b/assembly/src/main/resources/assembly_auth_final_v2.xml @@ -0,0 +1,117 @@ + + + dist + + zip + + false + moa-id-auth-final-${moa-id-version} + + + + + ${project.parent.basedir}/id/ConfigWebTool/target/ + ./ + + *.war + + + + ${project.parent.basedir}/id/oa/target + ./ + + *.war + + + + ${project.parent.basedir}/id/server/auth-final/target + ./ + + *.war + + + + + + ${project.parent.basedir}/id/ + ./ + + readme_${project.version}.txt + history.txt + + + + ${project.parent.basedir}/ + ./ + + EUPL v.1.1 - Licence.pdf + IAIK-LICENSE.txt + LICENSE-2.0.txt + NOTICE.txt + SIC_LICENSE.txt + + + + ${project.parent.basedir}/id/server/data/deploy/conf/ + ./conf + + Catalina/** + moa-id-proxy/** + + + + ${project.parent.basedir}/id/server/data/deploy/conf/ + ./doc/conf + + Catalina/** + moa-id-proxy/** + + + + ${project.parent.basedir}/id/server/doc/handbook/ + ./doc/handbook + + + ${project.parent.basedir}/id/server/data/deploy/tomcat/ + ./tomcat + + + + + ${project.basedir}/src/main/resources/data/pkcs11/ + ./pkcs11 + + + + ${project.basedir}/src/main/resources/data/endorsed/ + ./endorsed + + + ${project.parent.basedir}/id/server/auth-final/target/moa-id-auth-final-${moa-id-version}/WEB-INF/lib/ + ./endorsed + + serializer*.jar + xalan*.jar + xercesImpl*.jar + + + + + ${project.basedir}/src/main/resources/data/ext/ + ./ext + + + ${project.parent.basedir}/id/server/auth-final/target/moa-id-auth-final-${moa-id-version}/WEB-INF/lib/ + ./ext + + iaik_jce_full*.jar + + + + + + + + diff --git a/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar b/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar new file mode 100644 index 000000000..817684fb7 Binary files /dev/null and b/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar differ diff --git a/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar b/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar new file mode 100644 index 000000000..a348db04e Binary files /dev/null and b/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar differ diff --git a/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar b/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar new file mode 100644 index 000000000..940c1824d Binary files /dev/null and b/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar differ diff --git a/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so new file mode 100644 index 000000000..eacbb13b2 Binary files /dev/null and b/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so differ diff --git a/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so new file mode 100644 index 000000000..c5f7d595f Binary files /dev/null and b/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so differ diff --git a/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so new file mode 100644 index 000000000..1f58fe949 Binary files /dev/null and b/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so differ diff --git a/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll b/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll new file mode 100644 index 000000000..c1ee108b8 Binary files /dev/null and b/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll differ diff --git a/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll b/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll new file mode 100644 index 000000000..651a0e5cb Binary files /dev/null and b/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll differ -- cgit v1.2.3 From ba6ba0af88d8c9472a63356ddf3d19f84847c2d7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 28 Jul 2021 11:33:11 +0200 Subject: add new authentication module for EHVD communication --- assembly/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index 7a4d88ad3..b4fed23ee 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -153,6 +153,11 @@ moa-id-module-EID_connector + + MOA.id.server.modules + moa-id-module-ehvd_integration + + MOA.id moa-id-webgui -- cgit v1.2.3 From 2585437075bf57d95e271751d7d6695bf6673f86 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 13 Dec 2021 11:30:20 +0100 Subject: switch to next release-canditate --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index b4fed23ee..47d063e07 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.6-SNAPSHOT + 4.1.6-RC1 4.0.0 -- cgit v1.2.3 From 595129ee21197f5c03bedb6369dda7ee62178d8d Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 14 Dec 2021 16:32:45 +0100 Subject: switch to next release version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index 47d063e07..fa14f9181 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.6-RC1 + 4.1.6 4.0.0 -- cgit v1.2.3 From 0278635fdf6a524afd44aa5336c5a147b78546e0 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 14 Dec 2021 17:55:46 +0100 Subject: switch to next snapshot version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index fa14f9181..f0c71a819 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.6 + 4.1.7-SNAPSHOT 4.0.0 -- cgit v1.2.3 From 8ebd4daefc9626248f788dcf5fd340b72a0ec1df Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 15 Dec 2021 08:25:56 +0100 Subject: switch to next release version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index f0c71a819..1ab516094 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.7-SNAPSHOT + 4.1.7 4.0.0 -- cgit v1.2.3 From 43752e9eb9bdba0703bacd48dfdbba5190aec7b3 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 15 Dec 2021 09:35:30 +0100 Subject: switch to next snapshot version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index 1ab516094..d25089860 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.7 + 4.1.8-SNAPSHOT 4.0.0 -- cgit v1.2.3 From 81df147ba8fbc6d2772d0ccd23b329683c625469 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 20 Dec 2021 08:18:38 +0100 Subject: switch to next release-candidate version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index d25089860..9295d724f 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.1.8-SNAPSHOT + 4.2.0-RC1 4.0.0 -- cgit v1.2.3 From 600369d4ffa753716a9572824de7a96a04cb05a7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 20 Dec 2021 10:58:20 +0100 Subject: switch to next release version --- assembly/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assembly') diff --git a/assembly/pom.xml b/assembly/pom.xml index 9295d724f..d30de1786 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ MOA MOA - 4.2.0-RC1 + 4.2.0 4.0.0 -- cgit v1.2.3