Skip to content

Feat: #82 Update to newer java version #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 5, 2024
Merged

Feat: #82 Update to newer java version #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec7060e
feat: #82 Update from java 11 to java 17. Something may fail.
dmitry-weirdo Nov 5, 2024
cc79f34
feat: #82 Also update source and target for the compiler to java 17.
dmitry-weirdo Nov 5, 2024
f5cc483
feat: #82 Update to a newer Lombok to make the project compile under …
dmitry-weirdo Nov 5, 2024
759ca76
feat: #82 Update to Java 21 in the GitHub Actions config.
dmitry-weirdo Nov 5, 2024
3fc7be6
build: #82 Provide the required `distribution` argument for setup-jav…
dmitry-weirdo Nov 5, 2024
5947b6e
feat: #82 Switch to a modern maven-war-plugin that should support the…
dmitry-weirdo Nov 5, 2024
514bd5b
feat: #82 Also use Java 21 in the "CodeQL Analyze Java" pipeline job.
dmitry-weirdo Nov 5, 2024
d4d06ac
feat: #82 Use the modern versions of `actions/cache` of GitHub Actions.
dmitry-weirdo Nov 5, 2024
11ce5d5
feat: #82 Update `github/codeql-action` to v3.
dmitry-weirdo Nov 5, 2024
b3421a2
feat: #82 Update `actions/checkout` to v4.
dmitry-weirdo Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions .github/workflows/analyze.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,27 @@ jobs:
runs-on: ubuntu-latest
# for local run -- $ act -j build -P ubuntu-latest=nektos/act-environments-ubuntu:18.04
steps:
# Clone repository with all branches and tags into github virtual machine
- uses: actions/checkout@v2
# Clone repository with all branches and tags into GitHub virtual machine
- uses: actions/checkout@v4
with:
fetch-depth: 0

# see https://github.com/actions/setup-java
# Download and Install specific JDK version
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 1.11
distribution: 'temurin'
java-version: 21

# for act caching download https://static.azul.com/zulu/bin/zulu11.43.21-ca-jdk11.0.9-linux_x64.tar.gz
# to root workdir an uncomment
# jdkFile: zulu11.43.21-ca-jdk11.0.9-linux_x64.tar.gz

# Load packages from cache if present
# see https://github.com/actions/cache
- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -61,17 +65,17 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
config-file: ./.github/codeql/js-config.yml
languages: javascript
queries: security-and-quality

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3

# CodeQL analyzes Java code in repository
codeql_java:
Expand All @@ -80,36 +84,39 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
# exclude html directory from java analysis
- name: Remove HTML directory
run: rm -rf html

# Download and Install specific JDK version
- name: Set up JDK 1.11
uses: actions/setup-java@v1
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 1.11
distribution: 'temurin'
java-version: 21

# for act caching download https://static.azul.com/zulu/bin/zulu11.43.21-ca-jdk11.0.9-linux_x64.tar.gz
# to root workdir an uncomment
# to root workdir uncomment
# jdkFile: zulu11.43.21-ca-jdk11.0.9-linux_x64.tar.gz

# Load packages from cache if present
# see https://github.com/actions/cache
- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: java
queries: security-and-quality
# Automatically builds project with maven
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</modules>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
<lombok.version>1.18.16</lombok.version>
<lombok.version>1.18.30</lombok.version>
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
<freemarker.version>2.3.30</freemarker.version>
<springboot.version>2.4.1</springboot.version>
Expand All @@ -37,10 +37,10 @@
<swagger-annotations-version>1.5.8</swagger-annotations-version>

<!-- plugin versions -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-war-plugin.version>2.1.1</maven-war-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<openapi-generator-maven-plugin.version>5.0.0</openapi-generator-maven-plugin.version>
Expand Down Expand Up @@ -91,8 +91,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>11</source> <!-- same as <java.version> -->
<target>11</target>
<source>${java.version}</source> <!-- same as <java.version> -->
<target>${java.version}</target>
</configuration>
</plugin>

Expand Down