Merge branch 'springshell' into 'main'

Updates for CVE-2022-22965

See merge request genesys-pgr/genesys-server!697

docker/Dockerfile

@@ -15,7 +15,7 @@ WORKDIR /unpacked
 # 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

pom.xml

@@ -70,7 +70,7 @@
 		<servlet-api.version>4.0.1</servlet-api.version>
 		<jsp-api.version>2.3.3</jsp-api.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>
@@ -96,7 +96,7 @@
 		<liquibase-hibernate5.version>4.3.5</liquibase-hibernate5.version>
 
 		<!--Container -->
-		<jetty.version>9.4.40.v20210413</jetty.version>
+		<jetty.version>9.4.46.v20220331</jetty.version>
 
 		<maven.test.skip>false</maven.test.skip>