Move to Java 17
This commit is contained in:
parent
ad97e2c9a3
commit
6a92f651f8
10
.github/workflows/branch_build.yml
vendored
10
.github/workflows/branch_build.yml
vendored
@ -12,11 +12,11 @@ jobs:
|
||||
name: "Package and linting"
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: set up JDK 16
|
||||
- name: set up JDK 17
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 16
|
||||
java-version: 17
|
||||
architecture: x64
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v2.1.5
|
||||
@ -38,11 +38,11 @@ jobs:
|
||||
- mvn -pl webgoat-integration-tests test
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: set up JDK 16
|
||||
- name: set up JDK 17
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: 16
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
architecture: x64
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v2.1.5
|
||||
|
2
.github/workflows/pr_build.yml
vendored
2
.github/workflows/pr_build.yml
vendored
@ -26,7 +26,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
java: [16]
|
||||
java: [17]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK ${{ matrix.java }}
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM eclipse-temurin:16.0.2_7-jdk-focal
|
||||
FROM eclipse-temurin:17_35-jdk-focal
|
||||
|
||||
RUN apt-get update
|
||||
RUN useradd -ms /bin/bash webgoat
|
||||
|
11
pom.xml
11
pom.xml
@ -19,10 +19,6 @@
|
||||
<inceptionYear>2006</inceptionYear>
|
||||
<url>https://github.com/WebGoat/WebGoat</url>
|
||||
|
||||
<prerequisites>
|
||||
<maven>3.2.5</maven>
|
||||
</prerequisites>
|
||||
|
||||
<organization>
|
||||
<name>OWASP</name>
|
||||
<url>https://github.com/WebGoat/WebGoat/</url>
|
||||
@ -114,11 +110,10 @@
|
||||
<!-- Use UTF-8 Encoding -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<maven.compiler.source>15</maven.compiler.source>
|
||||
<maven.compiler.target>15</maven.compiler.target>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
|
||||
<!-- Shared properties with plugins and version numbers across submodules-->
|
||||
<activation.version>1.1.1</activation.version>
|
||||
<asciidoctorj.version>2.5.2</asciidoctorj.version>
|
||||
<commons-collections.version>3.2.1</commons-collections.version>
|
||||
<commons-lang3.version>3.12.0</commons-lang3.version>
|
||||
@ -132,7 +127,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-M5</maven-surefire-plugin.version>
|
||||
<java.version>15</java.version>
|
||||
<java.version>17</java.version>
|
||||
</properties>
|
||||
|
||||
<modules>
|
||||
|
Loading…
x
Reference in New Issue
Block a user