Skip to content

Commit

Permalink
Update to Spring Boot 3 and JDK 17 (#304)
Browse files Browse the repository at this point in the history
* Update to Spring Boot 3 and JDK 17
Update other Dependencies

* Fix CI

* Fix CI

* Update OWASP Dependency Check
  • Loading branch information
f11h authored Feb 17, 2023
1 parent 83cdcd0 commit a57826d
Show file tree
Hide file tree
Showing 36 changed files with 151 additions and 292 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/ci-manual-tomcat-deploy

This file was deleted.

5 changes: 3 additions & 2 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ jobs:
path: ~/.m2/repository
key: ${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ env.cache-name }}-
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 11
java-version: 17
distribution: adopt
- name: environment
run: |
sudo apt-get install --yes --no-install-recommends libxml-xpath-perl
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ci-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ jobs:
path: ~/.m2/repository
key: ${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ env.cache-name }}-
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 11
java-version: 17
distribution: adopt
- name: mvn package
run: mvn --batch-mode package
5 changes: 3 additions & 2 deletions .github/workflows/manual-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ jobs:
path: ~/.m2/repository
key: ${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ env.cache-name }}-
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 11
java-version: 17
distribution: adopt
- name: environment
run: |
sudo apt-get install --yes --no-install-recommends libxml-xpath-perl
Expand Down
2 changes: 1 addition & 1 deletion codestyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
Expand Down
1 change: 1 addition & 0 deletions lombok.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
22 changes: 4 additions & 18 deletions owasp/suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
<notes>see https://github.com/jeremylong/DependencyCheck/issues/1827></notes>
<cve>CVE-2018-1258</cve>
<notes>H2 is only used for testing, not production</notes>
<cve>CVE-2022-45868</cve>
</suppress>
<suppress>
<notes>see https://github.com/jeremylong/DependencyCheck/issues/2952</notes>
<cve>CVE-2011-2732</cve>
<cve>CVE-2011-2731</cve>
<cve>CVE-2012-5055</cve>
</suppress>
<suppress>
<notes>see https://tomcat.apache.org/security-9.html#Apache_Tomcat_9.x_vulnerabilities vulnerability is fixed in tomcat 9.0.38</notes>
<cve>CVE-2020-13943</cve>
</suppress>
<suppress>
<notes>H2 Vulnerability suppressed</notes>
<cve>CVE-2021-23463</cve>
</suppress>
<suppress>
<notes>netty-transport-4.1.70 Vulnerability</notes>
<cve>CVE-2021-43797</cve>
<notes>no YAML content from users is parsed within this service</notes>
<cve>CVE-2022-1471</cve>
</suppress>
</suppressions>
Loading

0 comments on commit a57826d

Please sign in to comment.