Skip to content
This repository was archived by the owner on May 16, 2023. It is now read-only.

Commit 0507b37

Browse files
authored
Update CWA-Parent to Spring Boot 3 and JDK 17 (#13)
* Update to Spring Boot 3 * Update to Spring Boot 3 * Update Dependencies * Update CI Jobs to Java 17 * Update Readme * Update OWASP Exclusions * Update OWASP Exclusions
1 parent 99ed8ef commit 0507b37

8 files changed

Lines changed: 72 additions & 134 deletions

File tree

.github/workflows/ci-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
restore-keys: ${{ env.cache-name }}-
2121
- uses: actions/setup-java@v1
2222
with:
23-
java-version: 11
23+
java-version: 17
2424
- name: environment
2525
run: |
2626
sudo apt-get install --yes --no-install-recommends libxml-xpath-perl

.github/workflows/ci-pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
- reopened
88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/setup-java@v2
1313
with:
14-
java-version: 11
14+
java-version: 17
1515
distribution: adopt
1616
- uses: actions/checkout@v2
1717
with:
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- uses: actions/setup-java@v2
3333
with:
34-
java-version: 11
34+
java-version: 17
3535
distribution: adopt
3636
- uses: actions/checkout@v2
3737
with:

.github/workflows/ci-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
restore-keys: ${{ env.cache-name }}-
3131
- uses: actions/setup-java@v1
3232
with:
33-
java-version: 11
33+
java-version: 17
3434
- name: version
3535
run: >-
3636
APP_SHA=$(git rev-parse --short ${GITHUB_SHA});

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ In either case open a terminal pointing to the directory you put the sources in.
6060
#### Maven based build
6161
This is the recommended way for taking part in the development.
6262
Please check, whether following prerequisites are installed on your machine:
63-
- [Open JDK 11](https://openjdk.java.net) or a similar JDK 11 compatible VM
63+
- [Open JDK 17](https://adoptium.net) or a similar JDK 17 compatible VM
6464
- [Maven](https://maven.apache.org)
6565

6666
## Documentation

keycloak/pom.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,21 @@
2323
<version>${project.parent.version}</version>
2424
<type>pom</type>
2525
</dependency>
26-
2726
<dependency>
28-
<groupId>org.keycloak</groupId>
29-
<artifactId>keycloak-spring-boot-starter</artifactId>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-security</artifactId>
3033
</dependency>
3134
<dependency>
3235
<groupId>com.c4-soft.springaddons</groupId>
33-
<artifactId>spring-security-oauth2-test-addons</artifactId>
36+
<artifactId>spring-addons-oauth2-test</artifactId>
3437
</dependency>
3538
<dependency>
3639
<groupId>com.c4-soft.springaddons</groupId>
37-
<artifactId>spring-security-oauth2-test-webmvc-addons</artifactId>
40+
<artifactId>spring-addons-webmvc-test</artifactId>
3841
</dependency>
3942
</dependencies>
4043
</project>

mysql-persistence/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<artifactId>h2</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>mysql</groupId>
36-
<artifactId>mysql-connector-java</artifactId>
35+
<groupId>com.mysql</groupId>
36+
<artifactId>mysql-connector-j</artifactId>
3737
<scope>runtime</scope>
3838
</dependency>
3939
<dependency>

owasp/suppressions.xml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
4-
<suppress>
5-
<notes>CVE is matching for Spring Security 5.3.x, but we have 5.7.x</notes>
6-
<cve>CVE-2020-5408</cve>
7-
</suppress>
8-
9-
<suppress>
10-
<notes>CVE is matching for Spring Framework up to 5.3.20, but we have 5.3.21</notes>
11-
<cve>CVE-2016-1000027</cve>
12-
</suppress>
13-
143
<suppress>
15-
<notes>False Positive matches</notes>
16-
<cve>CVE-2022-31514</cve>
17-
<cve>CVE-2022-2393</cve>
4+
<notes>Both CVE are matching for eclipse ide</notes>
5+
<cve>CVE-2008-7271</cve>
6+
<cve>CVE-2010-4647</cve>
187
</suppress>
198

209
<suppress>
21-
<notes>SnakeYML False Positive Matcher (CVE is up to 1.32, but also matches for 1.33)</notes>
22-
<cve>CVE-2022-38752</cve>
10+
<notes>no YAML content from users is parsed within this service</notes>
11+
<cve>CVE-2022-1471</cve>
2312
</suppress>
2413

2514
<suppress>
26-
<notes>This CVE is only affecting Keycloak Server not the Lib. (https://bugzilla.redhat.com/show_bug.cgi?id=2141404)</notes>
27-
<cve>CVE-2022-3916</cve>
15+
<notes>H2 is only used for testing, not production</notes>
16+
<cve>CVE-2022-45868</cve>
2817
</suppress>
2918

3019
<suppress>
31-
<notes>The affected libs are just used for unit-testing.</notes>
32-
<cve>CVE-2022-31690</cve>
33-
<cve>CVE-2022-31692</cve>
20+
<notes>False positive. CVE is matching for hutools. OWASP Check matches for json-lib</notes>
21+
<cve>CVE-2022-45688</cve>
3422
</suppress>
3523

3624
</suppressions>

0 commit comments

Comments
 (0)