From 80ff1ae02a1080594433494fcf99e5e8ca470584 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 10 Dec 2020 14:38:12 +0100 Subject: switch to next snapshot version --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 49e008f78..3f6ca3f75 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.5 + 4.1.6-SNAPSHOT MOA @@ -14,14 +14,14 @@ UTF-8 - 4.1.5 + 4.1.6-SNAPSHOT - 4.1.5 - 4.1.5 + 4.1.6-SNAPSHOT + 4.1.6-SNAPSHOT 2.0.1 - 3.0.6 + 3.0.7-SNAPSHOT 2.0.8 1.3.2 -- cgit v1.2.3 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 --- pom.xml | 229 +++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 161 insertions(+), 68 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 3f6ca3f75..47daf6091 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + @@ -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 From 7c0b889c2eab8734f890c2a53175852422760416 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 1 Jun 2021 20:30:08 +0200 Subject: add dummy authentication-modul that loads eID information from local configuration --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 47daf6091..4469daed2 100644 --- a/pom.xml +++ b/pom.xml @@ -665,6 +665,14 @@ ${moa-id-version} + + MOA.id.server.modules + moa-id-module-dummy-authenticatiuon + ${moa-id-version} + + + + MOA.id.server.modules moa-id-module-sl20_authentication -- cgit v1.2.3 From dd90213ddbfeee68843fddaa7bf37624812ef217 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 7 Jun 2021 07:19:01 +0200 Subject: set 'needConsent' flag to false during dummy-authenticatio to over-roll SP configuration --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 4469daed2..3625fc973 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,8 @@ 4.1.6-SNAPSHOT + 4.1.5.2 + 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT @@ -667,8 +669,8 @@ MOA.id.server.modules - moa-id-module-dummy-authenticatiuon - ${moa-id-version} + moa-id-module-dummy-authenticatiuon + ${moa-id-dummy-auth.version} -- 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 --- pom.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 3625fc973..fcb8cba69 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 4.1.6-SNAPSHOT - 4.1.5.2 + 4.1.6-SNAPSHOT 4.1.6-SNAPSHOT @@ -27,7 +27,10 @@ 2.0.8 1.3.2 - + + 4.1.5.2 + 4.1.5.3 + 0.3 1.0.15 @@ -669,12 +672,17 @@ MOA.id.server.modules - moa-id-module-dummy-authenticatiuon + moa-id-module-dummy-authenticatiuon ${moa-id-dummy-auth.version} - - + + MOA.id.server.modules + moa-id-module-ehvd_integration + ${moa-id-ehvd_integration.version} + + + MOA.id.server.modules moa-id-module-sl20_authentication -- cgit v1.2.3 From 37a34d1422fbde8813b4a6027b33e0549d753637 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 8 Sep 2021 13:46:32 +0200 Subject: switch EHVD module to RC1 version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index fcb8cba69..630d9cb10 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,8 @@ 1.3.2 - 4.1.5.2 - 4.1.5.3 + 4.1.5.2 + 4.1.5.3-RC1 0.3 -- cgit v1.2.3 From 48fac95b944583b50b1933de21a07a4f806b66d7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 16 Sep 2021 09:48:42 +0200 Subject: change version of EHVD module to RC2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 630d9cb10..4f0ff33bb 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.3.2 4.1.5.2 - 4.1.5.3-RC1 + 4.1.5.3-RC2 0.3 -- cgit v1.2.3 From 6b5dcf89313f270f3bda22af7d704be6e17548b5 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 30 Sep 2021 15:21:34 +0200 Subject: switch to final release version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 4f0ff33bb..90ab19386 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.3.2 4.1.5.2 - 4.1.5.3-RC2 + 4.1.5.3 0.3 -- cgit v1.2.3 From 0436de6184c1a95d463da52929e3bf60923d6e04 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 13 Dec 2021 09:23:09 +0100 Subject: update third-party libs and resolve API issues --- pom.xml | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 90ab19386..41eef6d83 100644 --- a/pom.xml +++ b/pom.xml @@ -34,53 +34,54 @@ 0.3 1.0.15 - 5.2.11.RELEASE - 2.3.5.RELEASE - 2.3.5.RELEASE + 5.3.13 + 2.6.0 + 2.6.0 2.22.0 2.3.1 2.3.0.1 - 30.0-jre + 31.0.1-jre 2.6.6 1.5.6 1.4.6 - 2.1.5 + 2.3.0 2.3.1 1.1 - 5.4.25.Final - 2.8.0 + 5.6.2.Final + 2.9.0 - 3.3.8 - 2.5.26 + 3.3.12 + 2.5.28 2.0.0 1.7.30 + 2.15.0 4.5.13 - 4.4.14 + 4.4.15 - 8.0.22 + 8.0.27 - 4.12 - 2.8.0 - 3.11 + 4.13.2 + 2.11.0 + 3.12.0 4.4 3.2.2 1.9 - 2.10.8 - - 2.12.0 + 2.10.13 + + 2.13.0 1.4 ${org.springframework.version} - 1.18.16 + 1.18.22 0.8.6 3.1.1 @@ -337,6 +338,12 @@ + + joda-time + joda-time + ${joda-time.version} + + org.apache.commons commons-dbcp2 @@ -443,9 +450,9 @@ ${slf4j.version} - org.slf4j - slf4j-log4j12 - ${slf4j.version} + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} @@ -460,12 +467,6 @@ compile - - org.apache.logging.log4j - log4j-core - 2.13.3 - - org.apache.httpcomponents httpclient @@ -745,7 +746,7 @@ iaik.prod iaik_jce_full - 5.61_moa + 5.62_moa @@ -824,7 +825,7 @@ xerces xercesImpl - 2.11.0 + 2.12.1 compile - 4.1.6-SNAPSHOT + 4.1.6-RC1 - 4.1.6-SNAPSHOT - 4.1.6-SNAPSHOT + 4.1.6-RC1 + 4.1.6-RC1T 2.0.1 - 3.0.7-SNAPSHOT + 3.0.7-RC1 2.0.8 1.3.2 -- cgit v1.2.3 From 0c0c12e5c9844e4a6dc968d49198ae16d0236814 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 14 Dec 2021 16:27:09 +0100 Subject: fix problem with session-data encryption on some deployments --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index ee3c746cc..4586b193e 100644 --- a/pom.xml +++ b/pom.xml @@ -535,12 +535,6 @@ JSSE-1.0 compile - - - - at.gv.egiz.eaaf -- 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 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 4586b193e..b69570428 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.6-RC1 + 4.1.6 MOA @@ -14,16 +14,16 @@ UTF-8 - 4.1.6-RC1 + 4.1.6 - 4.1.6-RC1 - 4.1.6-RC1T + 4.1.6 + 4.1.6 2.0.1 - 3.0.7-RC1 + 3.0.7 2.0.8 1.3.2 -- 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 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index b69570428..47f15af6c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.6 + 4.1.7-SNAPSHOT MOA @@ -14,16 +14,16 @@ UTF-8 - 4.1.6 + 4.1.7-SNAPSHOT - 4.1.6 - 4.1.6 + 4.1.7-SNAPSHOT + 4.1.7-SNAPSHOT 2.0.1 - 3.0.7 + 3.0.8-SNAPSHOT 2.0.8 1.3.2 -- cgit v1.2.3 From 67e60ddadd062dde4e6ecdf0ef0f574439eb280e Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 14 Dec 2021 17:56:40 +0100 Subject: update test dependencies to fix warnings during security checks --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 47f15af6c..ee733d2a0 100644 --- a/pom.xml +++ b/pom.xml @@ -400,6 +400,12 @@ ${cxf.version} + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + + commons-collections commons-collections @@ -878,6 +884,12 @@ ${org.springframework.version} + + org.springframework + spring-context + ${org.springframework.version} + + org.springframework.data spring-data-redis -- cgit v1.2.3 From 5c3c930884c94116351a0c1e0c1a111b7cf11263 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 15 Dec 2021 07:43:17 +0100 Subject: switch to log4j 2.16.0 to fix CVE-2021-45046 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index ee733d2a0..70f0471b5 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 2.0.0 1.7.30 - 2.15.0 + 2.16.0 4.5.13 4.4.15 -- cgit v1.2.3 From 84f2fe6eaebb2370c063eef22fbb463751d08026 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 15 Dec 2021 08:20:27 +0100 Subject: update one more test dependency --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 70f0471b5..1dcd0b704 100644 --- a/pom.xml +++ b/pom.xml @@ -399,12 +399,16 @@ cxf-rt-transports-http ${cxf.version} - org.apache.cxf cxf-rt-transports-http-jetty ${cxf.version} + + org.apache.cxf + cxf-rt-rs-extension-providers + ${cxf.version} + commons-collections -- 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 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 1dcd0b704..ef5703237 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.7-SNAPSHOT + 4.1.7 MOA @@ -14,17 +14,17 @@ UTF-8 - 4.1.7-SNAPSHOT + 4.1.7 - 4.1.7-SNAPSHOT - 4.1.7-SNAPSHOT + 4.1.7 + 4.1.7 2.0.1 - 3.0.8-SNAPSHOT - 2.0.8 + 3.0.8 + 2.0.9 1.3.2 -- 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 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index ef5703237..6a28bf6b9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.7 + 4.1.8-SNAPSHOT MOA @@ -14,16 +14,16 @@ UTF-8 - 4.1.7 + 4.1.8-SNAPSHOT - 4.1.7 - 4.1.7 + 4.1.8-SNAPSHOT + 4.1.8-SNAPSHOT 2.0.1 - 3.0.8 + 3.0.9-SNAPSHOT 2.0.9 1.3.2 -- cgit v1.2.3 From 7f39aaa3d8633e9f05d2570c756e5e1fcac9b017 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 20 Dec 2021 08:16:01 +0100 Subject: switch from log4j to logback --- pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 6a28bf6b9..99f846438 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,8 @@ 2.0.0 1.7.30 - 2.16.0 + 2.17.0 + 1.2.9 4.5.13 4.4.15 @@ -474,18 +475,18 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-1.2-api ${log4j.version} org.apache.logging.log4j - log4j-1.2-api + log4j-to-slf4j ${log4j.version} - org.apache.logging.log4j - log4j-core - ${log4j.version} + ch.qos.logback + logback-classic + ${logback.version} -- 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 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 99f846438..6787f3422 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.1.8-SNAPSHOT + 4.2.0-RC1 MOA @@ -14,22 +14,22 @@ UTF-8 - 4.1.8-SNAPSHOT + 4.2.0-RC1 - 4.1.8-SNAPSHOT - 4.1.8-SNAPSHOT + 4.2.0-RC1 + 4.2.0-RC1 2.0.1 - 3.0.9-SNAPSHOT - 2.0.9 + 3.1.0-RC1 + 2.1.0 1.3.2 - 4.1.5.2 - 4.1.5.3 + 4.1.5.2 + 4.1.5.3 0.3 -- 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 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 6787f3422..9d6d50ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ MOA MOA pom - 4.2.0-RC1 + 4.2.0 MOA @@ -14,16 +14,16 @@ UTF-8 - 4.2.0-RC1 + 4.2.0 - 4.2.0-RC1 - 4.2.0-RC1 + 4.2.0 + 4.2.0 2.0.1 - 3.1.0-RC1 + 3.1.0 2.1.0 1.3.2 -- cgit v1.2.3