Merge branch 'master' of github.com:skjolber/3d-bin-container-packing…

… into openapi
skjolber · Dec 1, 2024 · 5cc9a3e · 5cc9a3e
2 parents 1c6f0a7 + 21be7ba
commit 5cc9a3e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 57 deletions.
diff --git 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
diff --git a/pom.xml b/pom.xml
@@ -16,32 +16,32 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
 		<commons-math3.version>3.6.1</commons-math3.version>
-		<mockito.version>5.12.0</mockito.version>
+		<mockito.version>5.14.2</mockito.version>
 
 		<eclipse-collections.version>11.1.0</eclipse-collections.version>
-		<google-truth.version>1.4.3</google-truth.version>
+		<google-truth.version>1.4.4</google-truth.version>
 		<junit-quicktest.version>1.0</junit-quicktest.version>
 		<junit.version>5.11.0</junit.version>
 		<jmh.version>1.37</jmh.version>
-		<commons-io.version>2.16.1</commons-io.version>
+		<commons-io.version>2.17.0</commons-io.version>
 
 		<!-- plugins -->
 		<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
 		<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
 		<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
-		<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
 		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-		<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+		<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-		<maven-gpg-plugin.version>3.2.2</maven-gpg-plugin.version>
+		<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
 		<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
 		<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
 		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
 		<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
-		<jqwik.version>1.9.0</jqwik.version>
+		<jqwik.version>1.9.1</jqwik.version>
 		<assertj.version>3.26.3</assertj.version>
 		<owasp-dependency-check.version>5.3.2</owasp-dependency-check.version>
-		<pitest.version>1.16.1</pitest.version>
+		<pitest.version>1.17.1</pitest.version>
 		<jackson.version>2.18.2</jackson.version>
 		<spotless.version>2.43.0</spotless.version>
 	</properties>