From 721edc9985dc134f0d4e01450d6e7f2d8430e36f Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Fri, 2 Apr 2021 11:03:59 +0200
Subject: [PATCH] Move WebGoat to Java 15

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/release.yml | 8 ++++----
 docker/Dockerfile             | 2 +-
 docker/Readme.md              | 2 +-
 pom.xml                       | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a9d876378..7b53ba0141 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [11, 15]
+        java: [15]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b9bf1c466..1af644c2ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,10 +16,10 @@ jobs:
         id: tag
         uses: dawidd6/action-get-tag@v1
 
-      - name: Set up JDK 11
+      - name: Set up JDK 15
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 15
           architecture: x64
 
       - name: Cache Maven packages
@@ -111,10 +111,10 @@ jobs:
           ref: develop
           token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
 
-      - name: Set up JDK 11
+      - name: Set up JDK 15
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 15
           architecture: x64
 
       - name: Set version to next snapshot
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2f5df2edcf..cb48d17fdf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11.0.1-jre-slim-stretch
+FROM openjdk:15.0.2-slim
 
 ARG webgoat_version=v8.2.0-SNAPSHOT
 ENV webgoat_version_env=${webgoat_version}
diff --git a/docker/Readme.md b/docker/Readme.md
index 8e321fa9b9..4f2fcc6cf4 100644
--- a/docker/Readme.md
+++ b/docker/Readme.md
@@ -2,7 +2,7 @@
 
 ## Docker build
 
-	docker build --no-cache --build-arg webgoat_version=v8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
+	docker build --no-cache --build-arg webgoat_version=8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
 	
 ## Docker run
 	
diff --git a/pom.xml b/pom.xml
index 2c27c7f8fe..f853026959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,8 +115,8 @@
         <!-- Use UTF-8 Encoding -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
 
         <!-- This build number will be ubdated by Travis-CI -->
         <build.number>build</build.number>
@@ -134,6 +134,7 @@
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+        <java.version>15</java.version>
     </properties>
 
     <modules>