Skip to content

Commit

Permalink
Move WebGoat to Java 15
Browse files Browse the repository at this point in the history
  • Loading branch information
nbaars committed Apr 3, 2021
1 parent 8219842 commit 721edc9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion docker/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 721edc9

Please sign in to comment.