From de0dd8a14e1669245a4d481729990e1168eb9e5d Mon Sep 17 00:00:00 2001
From: Jeffery Antoniuk <jeffery.antoniuk@ualberta.ca>
Date: Tue, 17 Nov 2020 10:13:50 -0700
Subject: [PATCH] security updates

* update tomcat

* update spring
---
 Dockerfile         |  6 ++----
 docker-compose.yml | 11 +++++++++++
 pom.xml            |  6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 5c60f14..f27830d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,7 @@
 
 
 ######## Stage #1: build
-
-FROM maven:3-jdk-13 AS build_stage
+FROM maven:3.6-openjdk-11 AS build_stage
 
 ARG APP_SRC=/app
 
@@ -20,8 +19,7 @@ RUN mvn compile && mvn package war:war
 
 
 ######## stage #2 Tomcat
-
-FROM tomcat:9 AS tomcat_stage
+FROM tomcat:9.0-jdk11-openjdk AS tomcat_stage
 
 ARG APP_SRC=/app
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e95e0bf
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3.7'
+
+services:
+
+  validator:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    #image: "cwrc/cwrc-validator:latest"
+    #volumes:
+    #  - ./container_volumes/validator/:/usr/local/tomcat/logs
diff --git a/pom.xml b/pom.xml
index a387229..5836428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,17 +10,17 @@
         <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>5.2.1.RELEASE</version>
+                <version>5.2.11.RELEASE</version>
         </dependency>
         <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>5.2.1.RELEASE</version>
+                <version>5.2.11.RELEASE</version>
         </dependency>
         <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
-                <version>[5.2.3,)</version>
+                <version>5.2.11.RELEASE</version>
         </dependency>
         <dependency>
                 <groupId>org.apache.taglibs</groupId>