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 --- .gitlab-ci.yml | 32 ++- README.md | 84 ++++++++ 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 id/ConfigWebTool/pom.xml | 9 +- id/assembly-auth-edu.xml | 191 ----------------- id/assembly-auth-final.xml | 191 ----------------- id/assembly-proxy.xml | 120 ----------- id/oa/pom.xml | 2 +- pom.xml | 229 +++++++++++++++------ 19 files changed, 670 insertions(+), 586 deletions(-) create mode 100644 README.md 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 delete mode 100644 id/assembly-auth-edu.xml delete mode 100644 id/assembly-auth-final.xml delete mode 100644 id/assembly-proxy.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0d68b89a..1eb2aee6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,21 @@ -image: maven:latest +image: maven:3.6.3-jdk-11 variables: LC_ALL: "en_US.UTF-8" LANG: "en_US.UTF-8" LANGUAGE: "en_US" - LIB_NAME: "MOA-ID" + LIB_NAME: "moa-id" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true --settings ${CI_PROJECT_DIR}/.cisettings.xml" MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" GIT_SUBMODULE_STRATEGY: recursive GIT_DEPTH: "2" SECURE_LOG_LEVEL: "debug" + JACOCO_CSV_LOCATION: '${CI_PROJECT_DIR}/assembly/target/site/jacoco-aggregate-ut/jacoco.csv' + JACOCO_XML_LOCATION: '${CI_PROJECT_DIR}/assembly/target/site/jacoco-aggregate-ut/jacoco.xml' include: - template: Dependency-Scanning.gitlab-ci.yml - - template: Security/SAST.gitlab-ci.yml - template: Secret-Detection.gitlab-ci.yml - - template: Code-Quality.gitlab-ci.yml stages: - assemble @@ -31,23 +31,35 @@ assemble: stage: assemble except: - tags + tags: + - docker script: | mvn $MAVEN_CLI_OPTS compile test + coverage: '/([0-9]{1,3}.[0-9]*).%.covered/' + after_script: + - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' $JACOCO_CSV_LOCATION artifacts: when: always reports: junit: "**/target/surefire-reports/TEST-*.xml" - + paths: + - $JACOCO_CSV_LOCATION + - $JACOCO_XML_LOCATION + + publishToGitlab: stage: package + tags: + - docker except: - tags + - /^feature/.*$/i before_script: - mkdir -p ~/.ssh - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts script: | - export VERSION=$(mvn -B help:evaluate -Dexpression=project.version -B | grep -v "\[INFO\]" | grep -Po "\d+\.\d+\.\d+((-\w*)+)?") + export VERSION=$(mvn -B help:evaluate -Dexpression=project.version -B | grep -v "\[WARNING\]" | grep -v "\[INFO\]" | grep -Po "\d+\.\d+\.\d+((-\w*)+)?") echo "Publishing version $VERSION for $LIB_NAME to public EGIZ maven" mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml -P jenkinsDeploy -DskipTests echo "VERSION=$VERSION" >> variables.env @@ -59,20 +71,18 @@ publishToGitlab: release: stage: release image: registry.gitlab.com/gitlab-org/release-cli:latest + tags: + - docker needs: - job: publishToGitlab artifacts: true when: manual only: - master - before_script: - - mkdir -p ~/.ssh - - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts script: | echo "Releasing version $VERSION of $LIB_NAME" echo "Publishing version $VERSION to public EGIZ maven" - mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml -P jenkinsDeploy + mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml release: name: "$VERSION" tag_name: "v$VERSION" diff --git a/README.md b/README.md new file mode 100644 index 000000000..d3da33677 --- /dev/null +++ b/README.md @@ -0,0 +1,84 @@ +# MOA-ID / MOA E-ID Proxy + +## Description + +MOA-ID is an identity-provider that supports identification, authentication, and mandate processing by using different authentication methods. The MOA-ID project consists for four Sub-Projects + +- **moa-id-auth-final** is the production build of the MOA-ID IDP that can be used for production environments. +- **moa-id-auth-edu** is the IDP for education usage that includes additional sub-modules and functionality that is not part of the production build. +- **moa-id-configuration** is the configuration interface for MOA-ID IDP +- **moa-id-oa** is a simple SAML2 service-provider application for testing only + +### Building + +The application is build into a Web-application and into a set of jars that can be directly used in another application. The Web application has to be deployed into an application service, like Apache Tomcat + +The project can be build with : + +``` +mvn clean package +``` + +The resulting `war` file's can be deployed into an application server + + + +The configuration will be set by Java System-Properties: + +- MOA-ID-AUTH + - _**-Dmoa.id.configuration**_ to set the configuration for MOA-ID itself + - _**-Dmoa.spss.server.configuration**=/path/to/configuration..._ to set the configuration for the MOA-SPSS sub-module +- MOA-ID-Configuration + - _**-Dmoa.id.webconfig**_ to set the configuration for MOA-ID-Configuration itself + - _**-Duser.properties**=/path/to/configuration..._ to set the configuration file base user-database +- MOA-ID-OA + - _**-Dmoa.id.demoOA**_ to set the configuration for MOA-ID-OA itself + +### Configuration + +A default configurations for MOA-ID and MOA-SPSS is located at _/id/server/data/deploy/conf/_ + + + +## Generate a Release Package + +The full release packages for will be automatically assembled by maven build-process. Before release build, all release related information have to added into infos folder. To add release informations follow the steps outlined below. + +Add a file with release informations to: +``` +./id/readme_{version}.txt +``` + +Add, remove, or update the application description in the handbook + +``` +modify: ./id/history.txt +``` +``` +modify: ./id/server/doc/handbook/ +``` + +Generate a release package with: + + +``` +maven package +``` + +The full release package will be located add +``` +./target/* +``` + +where + +- _moa-id-4.1.6-SNAPSHOT-dist.zip_ is the production build that has to be published on JoinUp +- _moa-id-4.1.6-SNAPSHOT-dist-edu.zip_ is the eduction build for internal usage only + + + +## Changelog + +**v4.1.6** + +- 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 diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index b6c82328b..63db8f8db 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -227,7 +227,10 @@ - + war + + moa-id-configuration + - - - moa-id-auth-edu-${moa-id-version} - - - - ${basedir}/id/server/data/deploy - / - - **/conf/Catalina/** - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-id/certs/certstore - - **/* - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-spss/certstore - - **/* - - - - ${basedir}/id/server/doc - /doc - - ${basedir}/id/server/doc/proxy/** - - - - ${basedir}/id/server/data/deploy/conf - /doc/conf - - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/id - / - - history.txt - readme_${moa-id-version}.txt - - - - ${basedir} - / - - LICENSE-2.0.txt - NOTICE.txt - IAIK-LICENSE.txt - EUPL v.1.1 - Licence.pdf - SIC_LICENSE.txt - - - - - - - - MOA.id.server:moa-id-auth-edu - - - true - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc - true - - - - - - MOA.id:moa-id-configuration - - - false - / - ${artifactId}.${extension} - false - - - - - - MOA.id.server:moa-id-commons - - - false - /migration/ - ${artifactId}.${extension} - false - - - /migration/dependency-jars - ${artifactId}.${extension} - - - - - - - - MOA.id:moa-id-oa - - - true - ../ - true - /source/${artifactId}/src - - **/target/** - **/bin/** - **/.settings/** - .* - - - pom.xml - - - - false - / - ${artifactId}.${extension} - false - - - - iaik:commons-iaik - MOA:moa-common - - /source/repositority - ${artifactId}.${extension} - - - - - - - - - component-pkcs11libs.xml - - - diff --git a/id/assembly-auth-final.xml b/id/assembly-auth-final.xml deleted file mode 100644 index 504f5620a..000000000 --- a/id/assembly-auth-final.xml +++ /dev/null @@ -1,191 +0,0 @@ - - id-auth-final-${moa-id-version} - - - dir - zip - - - - moa-id-auth-final-${moa-id-version} - - - - ${basedir}/id/server/data/deploy - / - - **/conf/Catalina/** - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-id/certs/certstore - - **/* - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-spss/certstore - - **/* - - - - ${basedir}/id/server/doc - /doc - - ${basedir}/id/server/doc/proxy/** - - - - ${basedir}/id/server/data/deploy/conf - /doc/conf - - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/id - / - - history.txt - readme_${moa-id-version}.txt - - - - ${basedir} - / - - LICENSE-2.0.txt - NOTICE.txt - IAIK-LICENSE.txt - EUPL v.1.1 - Licence.pdf - SIC_LICENSE.txt - - - - - - - - MOA.id.server:moa-id-auth-final - - - true - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc - true - - - - - - MOA.id:moa-id-configuration - - - false - / - ${artifactId}.${extension} - false - - - - - - MOA.id.server:moa-id-commons - - - false - /migration/ - ${artifactId}.${extension} - false - - - /migration/dependency-jars - ${artifactId}.${extension} - - - - - - - - MOA.id:moa-id-oa - - - true - ../ - true - /source/${artifactId}/src - - **/target/** - **/bin/** - **/.settings/** - .* - - - pom.xml - - - - false - / - ${artifactId}.${extension} - false - - - - iaik:commons-iaik - MOA:moa-common - - /source/repositority - ${artifactId}.${extension} - - - - - - - - - component-pkcs11libs.xml - - - diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml deleted file mode 100644 index d43783e69..000000000 --- a/id/assembly-proxy.xml +++ /dev/null @@ -1,120 +0,0 @@ - - id-proxy-${moa-id-proxy-version} - - - dir - zip - - - - moa-id-proxy-${moa-id-proxy-version} - - - - ${basedir}/id/server/data/deploy - / - - **/conf/moa-spss/** - **/conf/moa-id/transforms/** - - - - ${basedir}/id/server/doc/proxy - /doc - - - ${basedir}/id - / - - history.txt - readme_${moa-id-proxy-version}.txt - - - - ${basedir} - / - - LICENSE-2.0.txt - NOTICE.txt - IAIK-LICENSE.txt - EUPL v.1.1 - Licence.pdf - SIC_LICENSE.txt - - - - - - - - MOA.id.server:moa-id-proxy - - - true - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc - true - - - - - - - component-pkcs11libs.xml - - - diff --git a/id/oa/pom.xml b/id/oa/pom.xml index b4e8b9858..2897de96b 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -19,7 +19,7 @@ - oa + moa-id-oa @@ -74,8 +74,24 @@ 1.4 ${org.springframework.version} + + 1.18.16 + + 0.8.6 + 3.1.1 + 3.14.0 + 4.1.4 + 1.11.0 + + https://apps.egiz.gv.at/checkstyle/egiz_pmd_checks.xml + + + id + assembly + + default @@ -85,58 +101,40 @@ default - - id - - - - moaid_local - local - file:${basedir}/../../../repository - - - shibboleth.internet2.edu - Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ - - - jboss - https://repository.jboss.org/nexus/content/repositories/central/ - - true - - - - egiz-commons - https://apps.egiz.gv.at/maven/ - - true - - - false - - - - egiz-commons-snapshot - https://apps.egiz.gv.at/maven-snapshot/ - - false - - - true - - + + + jenkinsDeploy + - MOA_web - MOA Dependencies weblocation - - true - ignore - - default - https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository + egizMaven + sftp://apps.egiz.gv.at/maven - + + egizMaven + sftp://apps.egiz.gv.at/maven-snapshot + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + default-deploy + deploy + + deploy + + + + + + @@ -147,6 +145,14 @@ + + + org.apache.maven.wagon + wagon-ssh + 3.4.3 + + + @@ -244,24 +250,57 @@ - false - maven-assembly-plugin - - 2.2.2 - - - moa - UTF-8 - - id/assembly-auth-final.xml - id/assembly-auth-edu.xml - id/assembly-proxy.xml - - - - + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + pre-unit-test + + prepare-agent + + + + post-unit-report + test + + report + + + target/jacoco-report + + + + post-unit-check + test + + check + + + false + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + 0.70 + + + BRANCH + COVEREDRATIO + 0.70 + + + + + + + + org.codehaus.mojo versions-maven-plugin @@ -909,15 +948,69 @@ ${org.apache.commons.io.version} + + org.projectlombok + lombok + ${org.projectlombok.lombok.version} + provided + + + + shibboleth.internet2.edu + Internet2 + https://build.shibboleth.net/nexus/content/groups/public/ + + + jboss + https://repository.jboss.org/nexus/content/repositories/central/ + + true + + + + egiz-commons + https://apps.egiz.gv.at/maven/ + + true + + + false + + + + egiz-commons-snapshot + https://apps.egiz.gv.at/maven-snapshot/ + + false + + + true + + + + MOA_web + MOA Dependencies weblocation + + true + ignore + + default + https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository + + MOA MOA Dependencies - default file://${repositoryPath} + + true + ignore + + -- cgit v1.2.3