diff options
| author | Thomas <> | 2022-01-08 19:50:42 +0100 |
|---|---|---|
| committer | Thomas <> | 2022-01-08 19:50:42 +0100 |
| commit | 5bdcf4b0298da05efb06eb84acdb188e4313df75 (patch) | |
| tree | a1c40aef7914f58950d3ecc06e0811131430ddd3 /pom.xml | |
| parent | d7f9aa156ad76e5ddaf797a16f1155c37594bd91 (diff) | |
| parent | f59462296cf6eb0401be025a64b1be9ec8afc541 (diff) | |
| download | EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.tar.gz EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.tar.bz2 EAAF-Components-5bdcf4b0298da05efb06eb84acdb188e4313df75.zip | |
Merge branch 'opensaml_4.x' into nightlyBuild
# Conflicts:
# eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/PvpMetadataResolverAdapter.java
# eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/SamlVerificationEngine.java
# eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/binding/SoapBindingTest.java
# eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyMetadataProvider.java
# eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
# eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/PvpAuthnRequestBuilder.java
# pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -49,7 +49,7 @@ <!-- Other third-party libs --> <spring-boot-starter-web.version>2.6.2</spring-boot-starter-web.version> <org.springframework.version>5.3.14</org.springframework.version> - <org.opensaml.version>3.4.6</org.opensaml.version> + <org.opensaml.version>4.0.1</org.opensaml.version> <org.apache.santuario.xmlsec.version>2.3.0</org.apache.santuario.xmlsec.version> <org.cryptacular.version>1.2.4</org.cryptacular.version> <org.bouncycastle.bcprov-jdk15to18.version>1.70</org.bouncycastle.bcprov-jdk15to18.version> @@ -66,6 +66,7 @@ <org.apache.commons-collections4>4.4</org.apache.commons-collections4> <commons-io.version>2.11.0</commons-io.version> <commons-fileupload.version>1.4</commons-fileupload.version> + <javax.servlet-api>3.0.1</javax.servlet-api> <org.apache.velocity.version>1.7</org.apache.velocity.version> |