Merge branch 'springshell' into 'main'

Updates for CVE-2022-22965

See merge request grin-global/grin-global-server!392

(cherry picked from commit 08256190)

server/docker/Dockerfile

@@ -14,7 +14,7 @@ RUN mv WEB-INF/lib ..
 # RUN find .
 
 
-FROM jetty:9.4.40-jre11 as jetty
+FROM jetty:9.4.46-jre11 as jetty
 LABEL maintainer "Matija Obreza <matija.obreza@croptrust.org>"
 
 ENV USER=jetty

server/pom.xml

@@ -48,7 +48,7 @@
 		<commons.logging.version>1.2</commons.logging.version>
 		<commons.validator.version>1.7</commons.validator.version>
 
-		<spring.framework.version>5.3.9</spring.framework.version>
+		<spring.framework.version>5.3.19</spring.framework.version>
 		<spring-data-jpa.version>2.5.3</spring-data-jpa.version>
 		<spring.security.version>5.5.1</spring.security.version>
 		<spring.security.oauth2.version>2.5.1.RELEASE</spring.security.oauth2.version>
@@ -66,7 +66,7 @@
 		<application.blocks.version>3.2-SNAPSHOT</application.blocks.version>
 
 		<!--Container -->
-		<jetty.version>9.4.40.v20210413</jetty.version>
+		<jetty.version>9.4.46.v20220331</jetty.version>
 		<jstl.version>1.2</jstl.version>
 		<servlet-api.version>4.0.1</servlet-api.version>
 		<jsp-api.version>2.3.3</jsp-api.version>