diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6c562d51..28f4b4cc 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -8,23 +8,30 @@ on:
branches: [ '**' ]
jobs:
- build-with-maven-cache-github-action:
+ build:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ java: [ 17, 21]
+ name: Java ${{ matrix.java }} build
steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- - name: Set up JDK 11
+ - uses: actions/checkout@v4
+ - name: Set up Java
uses: actions/setup-java@v4
with:
- java-version: 11
- distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+ distribution: liberica
- name: Restore cache
- uses: skjolber/maven-cache-github-action@v1
+ uses: skjolber/maven-cache-github-action@v3.1.1
with:
step: restore
+ - name: Adjust memory use for Maven
+ run: echo "MAVEN_OPTS='-Xmx2g'" >> ~/.mavenrc
- name: Build with Maven
- run: mvn -B package --file pom.xml
- - name: Save cache
- uses: skjolber/maven-cache-github-action@v1
+ run: mvn verify
+ - name: Restore cache
+ uses: skjolber/maven-cache-github-action@v3.1.1
with:
- step: save
+ step: restore
+
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
deleted file mode 100644
index f75e474d..00000000
--- a/.github/workflows/sonarcloud.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This workflow will build a Java project with Maven
-# This runs only on PR
-
-name: SonarCloud QA
-
-on:
- push:
- branches:
- - master
-
-jobs:
- build:
- strategy:
- matrix:
- os: ['ubuntu-latest']
- runs-on: ${{ matrix.os }}
- permissions:
- checks: write
- pull-requests: write
- statuses: read
- steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- - name: Set up JDK 11
- uses: actions/setup-java@v4
- with:
- distribution: 'temurin'
- java-version: 11
- - uses: actions/cache@v4
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-v2-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-v2-
- - name: Build with Maven
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- run: mvn -B verify --file pom.xml -B verify sonar:sonar -Dsonar.projectKey=skjolber_3d-bin-container-packing -Dsonar.organization=skjolber-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
-
diff --git a/pom.xml b/pom.xml
index d4ec8bdf..a7fb2da5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,32 +16,32 @@
${java.version}
3.6.1
- 5.12.0
+ 5.14.2
11.1.0
- 1.4.3
+ 1.4.4
1.0
5.11.0
1.37
- 2.16.1
+ 2.17.0
1.9.1
0.8.12
1.7.0
- 3.3.1
+ 3.5.2
3.3.1
- 3.7.0
+ 3.11.1
2.5.3
- 3.2.2
+ 3.2.7
2.10
0.8.12
3.13.0
3.6.0
- 1.9.0
+ 1.9.1
3.26.3
5.3.2
- 1.16.1
+ 1.17.1
2.18.2
2.43.0