Skip to content

Commit 6a92f65

Browse files
committed
Move to Java 17
1 parent ad97e2c commit 6a92f65

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

.github/workflows/branch_build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
name: "Package and linting"
1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: set up JDK 16
15+
- name: set up JDK 17
1616
uses: actions/setup-java@v2
1717
with:
1818
distribution: 'temurin'
19-
java-version: 16
19+
java-version: 17
2020
architecture: x64
2121
- name: Cache Maven packages
2222
uses: actions/[email protected]
@@ -38,11 +38,11 @@ jobs:
3838
- mvn -pl webgoat-integration-tests test
3939
steps:
4040
- uses: actions/checkout@v2
41-
- name: set up JDK 16
41+
- name: set up JDK 17
4242
uses: actions/setup-java@v2
4343
with:
44-
distribution: 'zulu'
45-
java-version: 16
44+
distribution: 'temurin'
45+
java-version: 17
4646
architecture: x64
4747
- name: Cache Maven packages
4848
uses: actions/[email protected]

.github/workflows/pr_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest, windows-latest, macos-latest]
29-
java: [16]
29+
java: [17]
3030
steps:
3131
- uses: actions/checkout@v2
3232
- name: Set up JDK ${{ matrix.java }}

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:16.0.2_7-jdk-focal
1+
FROM eclipse-temurin:17_35-jdk-focal
22

33
RUN apt-get update
44
RUN useradd -ms /bin/bash webgoat

pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
<inceptionYear>2006</inceptionYear>
2020
<url>https://github.com/WebGoat/WebGoat</url>
2121

22-
<prerequisites>
23-
<maven>3.2.5</maven>
24-
</prerequisites>
25-
2622
<organization>
2723
<name>OWASP</name>
2824
<url>https://github.com/WebGoat/WebGoat/</url>
@@ -114,11 +110,10 @@
114110
<!-- Use UTF-8 Encoding -->
115111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
116112
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
117-
<maven.compiler.source>15</maven.compiler.source>
118-
<maven.compiler.target>15</maven.compiler.target>
113+
<maven.compiler.source>17</maven.compiler.source>
114+
<maven.compiler.target>17</maven.compiler.target>
119115

120116
<!-- Shared properties with plugins and version numbers across submodules-->
121-
<activation.version>1.1.1</activation.version>
122117
<asciidoctorj.version>2.5.2</asciidoctorj.version>
123118
<commons-collections.version>3.2.1</commons-collections.version>
124119
<commons-lang3.version>3.12.0</commons-lang3.version>
@@ -132,7 +127,7 @@
132127
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
133128
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
134129
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
135-
<java.version>15</java.version>
130+
<java.version>17</java.version>
136131
</properties>
137132

138133
<modules>

0 commit comments

Comments
 (0)