From 2f5425491ac88ec4b65157ac85bde58fb7dce34c Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Tue, 20 Apr 2021 09:30:30 +0200 Subject: update third-party libs and verify / fix some jUnit tests --- eaaf-springboot-utils/pom.xml | 5 --- eaaf_core/pom.xml | 5 --- eaaf_core_api/pom.xml | 5 --- eaaf_core_utils/pom.xml | 5 --- .../at/gv/egiz/eaaf/core/impl/utils/X509Utils.java | 5 ++- eaaf_modules/eaaf_module_auth_sl20/pom.xml | 5 --- eaaf_modules/eaaf_module_moa-sig/pom.xml | 7 ---- eaaf_modules/eaaf_module_pvp2_core/pom.xml | 5 --- .../modules/pvp2/test/binding/PostBindingTest.java | 10 +++--- .../modules/pvp2/test/binding/SoapBindingTest.java | 27 +++++++------- .../pvp2/test/metadata/MetadataResolverTest.java | 2 +- eaaf_modules/eaaf_module_pvp2_idp/pom.xml | 5 --- eaaf_modules/eaaf_module_pvp2_sp/pom.xml | 5 --- pom.xml | 42 ++++++++++++---------- 14 files changed, 45 insertions(+), 88 deletions(-) diff --git a/eaaf-springboot-utils/pom.xml b/eaaf-springboot-utils/pom.xml index 0846b1ca..3ce54516 100644 --- a/eaaf-springboot-utils/pom.xml +++ b/eaaf-springboot-utils/pom.xml @@ -65,11 +65,6 @@ - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index 2e9023a6..10aa328c 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -97,11 +97,6 @@ - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_core_api/pom.xml b/eaaf_core_api/pom.xml index 7ee6cac5..259f0c5c 100644 --- a/eaaf_core_api/pom.xml +++ b/eaaf_core_api/pom.xml @@ -53,11 +53,6 @@ javax.servlet-api provided - - junit - junit - test - diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml index e0cb88e3..7b79211a 100644 --- a/eaaf_core_utils/pom.xml +++ b/eaaf_core_utils/pom.xml @@ -97,11 +97,6 @@ provided - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/X509Utils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/X509Utils.java index e2fc4d1b..4d872ebe 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/X509Utils.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/X509Utils.java @@ -1,12 +1,11 @@ package at.gv.egiz.eaaf.core.impl.utils; import java.security.cert.X509Certificate; +import java.util.Arrays; import java.util.List; import javax.security.auth.x500.X500Principal; -import org.springframework.util.CollectionUtils; - public class X509Utils { /** @@ -17,7 +16,7 @@ public class X509Utils { * @return sorted Certificate Chain */ public static List sortCertificates(X509Certificate[] certChain) { - return sortCertificates(CollectionUtils.arrayToList(certChain)); + return sortCertificates(Arrays.asList(certChain)); } diff --git a/eaaf_modules/eaaf_module_auth_sl20/pom.xml b/eaaf_modules/eaaf_module_auth_sl20/pom.xml index b9c64873..0c3ba8c8 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/pom.xml +++ b/eaaf_modules/eaaf_module_auth_sl20/pom.xml @@ -52,11 +52,6 @@ provided - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml index f1889d13..a09c3340 100644 --- a/eaaf_modules/eaaf_module_moa-sig/pom.xml +++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml @@ -161,14 +161,7 @@ jaxen - - - junit - junit - test - - org.springframework spring-test test diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml index 1ce539ee..a39d305a 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml @@ -81,11 +81,6 @@ - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java index f14a9093..3288df14 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/PostBindingTest.java @@ -511,7 +511,7 @@ public class PostBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/html", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); @@ -545,7 +545,7 @@ public class PostBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/html", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); @@ -581,7 +581,7 @@ public class PostBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/html", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); @@ -619,7 +619,7 @@ public class PostBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/html", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); @@ -657,7 +657,7 @@ public class PostBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/html", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/html;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java index f3a7e01d..5393179d 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java @@ -3,19 +3,6 @@ package at.gv.egiz.eaaf.modules.pvp2.test.binding; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; -import at.gv.egiz.eaaf.core.api.IRequest; -import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl; -import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface; -import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider; -import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException; -import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception; -import at.gv.egiz.eaaf.modules.pvp2.impl.binding.SoapBinding; -import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.PvpMetadataResolverFactory; -import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xInitializer; -import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils; -import at.gv.egiz.eaaf.modules.pvp2.impl.validation.EaafUriCompare; -import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider; - import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Before; @@ -38,6 +25,18 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import at.gv.egiz.eaaf.core.api.IRequest; +import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl; +import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface; +import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider; +import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException; +import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception; +import at.gv.egiz.eaaf.modules.pvp2.impl.binding.SoapBinding; +import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.PvpMetadataResolverFactory; +import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xInitializer; +import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils; +import at.gv.egiz.eaaf.modules.pvp2.impl.validation.EaafUriCompare; +import at.gv.egiz.eaaf.modules.pvp2.test.dummy.DummyCredentialProvider; import net.shibboleth.utilities.java.support.logic.Constraint; import net.shibboleth.utilities.java.support.net.URIComparator; import net.shibboleth.utilities.java.support.xml.SerializeSupport; @@ -204,7 +203,7 @@ public class SoapBindingTest { Assert.assertEquals("http StatusCode", 200, httpResp.getStatus()); Assert.assertNotNull("PVP msg is null", httpResp.getContentLength()); - Assert.assertEquals("ContentType", "text/xml", httpResp.getContentType()); + Assert.assertEquals("ContentType", "text/xml;charset=UTF-8", httpResp.getContentType()); Assert.assertEquals("Encoding", "UTF-8", httpResp.getCharacterEncoding()); final String http = httpResp.getContentAsString(); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java index 1cbc2f14..72d6ebb8 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/metadata/MetadataResolverTest.java @@ -241,7 +241,7 @@ public class MetadataResolverTest { Assert.fail("Untrusted signature not detected"); } catch (final Pvp2MetadataException e) { - Assert.assertEquals("Wrong errorCode", "internal.pvp.07", e.getErrorId()); + Assert.assertEquals("Wrong errorCode", "internal.pvp.09", e.getErrorId()); } diff --git a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml index 47d2d8e4..1a9de245 100644 --- a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml @@ -30,11 +30,6 @@ - - junit - junit - test - org.springframework spring-test diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml index d1914ef6..5a9a6d0e 100644 --- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml @@ -36,11 +36,6 @@ - - junit - junit - test - org.springframework spring-test diff --git a/pom.xml b/pom.xml index 6d62b94c..39731cf2 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,10 @@ 1.34.0 - 2.3.7.RELEASE - 5.2.12.RELEASE - 3.4.5 - 2.2.0 + 2.4.5 + 5.3.6 + 3.4.6 + 2.2.1 1.2.4 1.68 1.68 @@ -58,7 +58,7 @@ 1.7.30 1.2.3 1.15 - 3.11 + 3.12.0 1.9 3.2.2 4.4 @@ -67,16 +67,16 @@ 3.0.1 1.7 1.3.2 - 2.10.8 + 2.10.10 3.0.2 - 30.0-jre + 30.1.1-jre 1.2.3 4.5.13 4.4.14 - 2.12.0 - 0.7.2 + 2.12.3 + 0.7.6 1.1.6 2.12.0 @@ -84,7 +84,7 @@ 2.22.1 - 4.13.1 + 5.7.1 4.4.1 2.0.9 @@ -93,9 +93,9 @@ 0.8.6 - 3.1.1 + 3.1.2 3.14.0 - 4.1.4 + 4.2.0 1.11.0 6.0.3 @@ -590,12 +590,6 @@ - - junit - junit - ${junit.version} - test - org.springframework spring-test @@ -650,6 +644,18 @@ + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter-api.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit-jupiter-api.version} + test + org.projectlombok lombok -- cgit v1.2.3