From 5acc09000c59c93510567e88cb701919122dc5b2 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Thu, 31 Aug 2023 12:04:23 +0200 Subject: feat(core): starting switch from Spring5/JAVA11 to Spring6/Java17 IMPORTEND: Is not finished because that contains a braking change, like javax.servlet.* --> jakarta.servket.* as one example and we miss some third-party libs that use the new API. # Conflicts: # eaaf_core_api/checks/spotbugs-exclude.xml # eaaf_core_api/pom.xml # eaaf_core_utils/checks/spotbugs-exclude.xml # pom.xml --- .../test/dummy/SpringSecurityConfiguration.java | 11 ++--- eaaf_core/pom.xml | 5 ++- eaaf_core_api/checks/spotbugs-exclude.xml | 16 +++++++- eaaf_core_api/pom.xml | 8 ++-- eaaf_core_utils/checks/spotbugs-exclude.xml | 16 ++++++++ eaaf_core_utils/pom.xml | 4 +- .../impl/credential/KeyStoreConfiguration.java | 4 +- .../impl/credential/SymmetricKeyConfiguration.java | 4 +- .../core/impl/http/HttpClientConfiguration.java | 4 +- eaaf_modules/eaaf_module_auth_sl20/pom.xml | 4 +- eaaf_modules/eaaf_module_moa-sig/pom.xml | 1 - eaaf_modules/eaaf_module_pvp2_core/pom.xml | 4 +- eaaf_modules/eaaf_module_pvp2_idp/pom.xml | 8 ++-- eaaf_modules/eaaf_module_pvp2_sp/pom.xml | 8 ++-- pom.xml | 47 +++++++++++++++------- 15 files changed, 97 insertions(+), 47 deletions(-) diff --git a/eaaf-springboot-utils/src/test/java/at/gv/egiz/eaaf/utils/springboot/test/dummy/SpringSecurityConfiguration.java b/eaaf-springboot-utils/src/test/java/at/gv/egiz/eaaf/utils/springboot/test/dummy/SpringSecurityConfiguration.java index b5054b70..2242b428 100644 --- a/eaaf-springboot-utils/src/test/java/at/gv/egiz/eaaf/utils/springboot/test/dummy/SpringSecurityConfiguration.java +++ b/eaaf-springboot-utils/src/test/java/at/gv/egiz/eaaf/utils/springboot/test/dummy/SpringSecurityConfiguration.java @@ -1,15 +1,16 @@ package at.gv.egiz.eaaf.utils.springboot.test.dummy; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.SecurityFilterChain; @Configuration -public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter { +public class SpringSecurityConfiguration { - @Override - public void configure(HttpSecurity http) throws Exception { - http.csrf().disable(); + @Bean + SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + return http.csrf((csfr) -> csfr.disable()).build(); } diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index f983a335..50d51400 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -90,8 +90,9 @@ commons-fileupload - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api + provided org.apache.velocity diff --git a/eaaf_core_api/checks/spotbugs-exclude.xml b/eaaf_core_api/checks/spotbugs-exclude.xml index 1c4cf203..acc5bd3f 100644 --- a/eaaf_core_api/checks/spotbugs-exclude.xml +++ b/eaaf_core_api/checks/spotbugs-exclude.xml @@ -9,4 +9,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/eaaf_core_api/pom.xml b/eaaf_core_api/pom.xml index 4fea906f..9a482b7e 100644 --- a/eaaf_core_api/pom.xml +++ b/eaaf_core_api/pom.xml @@ -53,8 +53,8 @@ jackson-annotations - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided @@ -69,7 +69,7 @@ - + com.github.spotbugs spotbugs-maven-plugin ${spotbugs-maven-plugin.version} @@ -78,7 +78,7 @@ checks/spotbugs-exclude.xml - + diff --git a/eaaf_core_utils/checks/spotbugs-exclude.xml b/eaaf_core_utils/checks/spotbugs-exclude.xml index 2b258e7c..f3ecd76e 100644 --- a/eaaf_core_utils/checks/spotbugs-exclude.xml +++ b/eaaf_core_utils/checks/spotbugs-exclude.xml @@ -40,4 +40,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml index 8949118e..103e8b13 100644 --- a/eaaf_core_utils/pom.xml +++ b/eaaf_core_utils/pom.xml @@ -107,8 +107,8 @@ provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java index 7e66ca86..6c00fb2e 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java @@ -199,9 +199,9 @@ public class KeyStoreConfiguration { */ public static KeyStoreType fromString(final String s) { try { - return KeyStoreType.valueOf(s.toUpperCase()); + return s != null ? KeyStoreType.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java index 9477789c..96d46381 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java @@ -185,9 +185,9 @@ public class SymmetricKeyConfiguration { */ public static SymmetricKeyType fromString(final String s) { try { - return SymmetricKeyType.valueOf(s.toUpperCase()); + return s != null ? SymmetricKeyType.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java index 7033a052..c189ff74 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java @@ -206,9 +206,9 @@ public class HttpClientConfiguration { */ public static ClientAuthMode fromString(final String s) { try { - return ClientAuthMode.valueOf(s.toUpperCase()); + return s != null ? ClientAuthMode.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/eaaf_modules/eaaf_module_auth_sl20/pom.xml b/eaaf_modules/eaaf_module_auth_sl20/pom.xml index ffbc2961..556f3aea 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/pom.xml +++ b/eaaf_modules/eaaf_module_auth_sl20/pom.xml @@ -47,8 +47,8 @@ provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml index 2915119a..613e841d 100644 --- a/eaaf_modules/eaaf_module_moa-sig/pom.xml +++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml @@ -180,7 +180,6 @@ ch.qos.logback logback-classic - 1.2.3 test diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml index ab77aa94..88523925 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml @@ -89,8 +89,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml index 3b89f1d5..bfd3b278 100644 --- a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml @@ -24,10 +24,10 @@ provided - javax.servlet - javax.servlet-api - provided - + jakarta.servlet + jakarta.servlet-api + provided + diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml index cf14d994..ea7f29fe 100644 --- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml +++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml @@ -30,10 +30,10 @@ provided - javax.servlet - javax.servlet-api - provided - + jakarta.servlet + jakarta.servlet-api + provided + diff --git a/pom.xml b/pom.xml index 0befce46..36ce80a4 100644 --- a/pom.xml +++ b/pom.xml @@ -46,17 +46,18 @@ 1.53.0 - 2.7.11 - 5.3.27 - 4.3.0 - 2.3.3 + 3.0.5 + 6.0.8 + 9.0.73 + 4.0.1 + 2.3.2 1.2.5 1.71.1 1.71.1 - 1.7.36 - 2.20.0 - 1.2.11 + 2.0.7 + 2.19.0 + 1.4.6 1.15 3.12.0 @@ -66,7 +67,7 @@ 2.11.0 1.5 - 3.0.1 + 4.0.4 2.3 1.3.2 @@ -91,20 +92,20 @@ 1.33 - 2.22.2 + 3.0.0 5.8.2 4.9.0 4.9.3 2.0.9 - 1.18.16 + 1.18.26 0.8.6 3.1.2 3.14.0 - 4.2.0 + 4.7.3.4 1.11.0 6.0.3 @@ -492,6 +493,24 @@ spring-webmvc ${org.springframework.version} + + + + org.apache.tomcat.embed + tomcat-embed-core + ${org.apache.tomcat.embed.version} + + + org.apache.tomcat.embed + tomcat-embed-el + ${org.apache.tomcat.embed.version} + + + org.apache.tomcat.embed + tomcat-embed-websocket + ${org.apache.tomcat.embed.version} + + org.slf4j slf4j-api @@ -586,9 +605,9 @@ - javax.servlet - javax.servlet-api - ${javax.servlet-api} + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api} provided -- cgit v1.2.3