Move WebGoat to Java 15
This commit is contained in:
parent
82198424df
commit
721edc9985
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -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 }}
|
||||
|
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
||||
|
5
pom.xml
5
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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user