Need newer Maven version

Bump minimum Maven version from 3.6.3 to 3.9.0. Use Maven container instead of installed Maven - see <actions/runner-images#8034> for why installed Maven is still 3.8.8 at this time.
ge-high-assurance · Nov 17, 2023 · 1effbe4 · 1effbe4
1 parent d7ce9fe
commit 1effbe4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 41 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -1,31 +1,34 @@
-# Runs whenever a pull request is created, modified, or reopened
-
 name: VERDICT Integration Workflow
 
+# Runs whenever a pull request is created, reopened, or modified
+
 on:
   pull_request:
     types: [ opened, reopened, synchronize ]
   workflow_dispatch:
 
-# Builds VERDICT source with Java and Maven
-# Caches Maven dependencies
+# Runs integration workflow as a CI check:
+# - Builds VERDICT source and runs unit tests
 
 jobs:
   integration:
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         os: [ ubuntu-22.04 ]
 
     steps:
     - name: Check out VERDICT source
       uses: actions/[email protected]
 
-    - name: Set up GraphViz
-      uses: ts-graphviz/setup-graphviz@v1
-
     - name: Set up Java and Maven
       uses: actions/[email protected]
       with:
@@ -37,5 +40,3 @@ jobs:
       run: |
         mvn -B install -f tools/verdict-back-ends/verdict-bundle/z3-native-libs/pom.xml
         mvn -B package -f tools/pom.xml -Dtycho.localArtifacts=ignore
-      env:
-        GraphVizPath: /usr/bin
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,26 +1,33 @@
-# Runs whenever the main branch is changed (except for tags)
-
 name: VERDICT Main Workflow
 
+# Runs whenever the main branch is changed (except for tags)
+
 on:
   push:
     branches: [ master ]
     tags-ignore: [ '*' ]
   workflow_dispatch:
 
-# Builds soteria_pp native binary
-# Builds VERDICT source with Java and Maven
-# Pushes verdict-dev image to Docker Hub
-# Updates verdict-dev in VERDICT-update-sites
+# Runs main workflow and uploads build artifacts:
+# - Builds soteria_pp native binary
+# - Builds VERDICT source and runs unit tests
+# - Pushes verdict-dev image to Docker Hub
+# - Updates verdict-dev in VERDICT-update-sites
 
 jobs:
   main:
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         ocaml-compiler: [ 4.09.1 ]
         os: [ macos-12, ubuntu-22.04 ]
 
@@ -41,10 +48,6 @@ jobs:
 
     # Run rest of steps only on Linux - macOS isn't needed
 
-    - name: Set up GraphViz
-      if: runner.os == 'Linux'
-      uses: ts-graphviz/setup-graphviz@v1
-
     - name: Set up Java and Maven
       if: runner.os == 'Linux'
       uses: actions/[email protected]
@@ -58,12 +61,6 @@ jobs:
       run: |
         mvn -B install -f tools/verdict-back-ends/verdict-bundle/z3-native-libs/pom.xml
         mvn -B package -f tools/pom.xml -Dtycho.localArtifacts=ignore
-      env:
-        GraphVizPath: /usr/bin
-
-    - name: Set up Docker Buildx
-      if: runner.os == 'Linux'
-      uses: docker/[email protected]
 
     - name: Login to Docker Hub
       if: runner.os == 'Linux'
@@ -72,6 +69,10 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Set up Docker Buildx
+      if: runner.os == 'Linux'
+      uses: docker/[email protected]
+
     - name: Build and push verdict-dev image
       if: runner.os == 'Linux'
       uses: docker/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,16 +1,17 @@
-# Runs whenever a release is published on GitHub
-
 name: VERDICT Release Workflow
 
+# Runs whenever a release is published on GitHub
+
 on:
   release:
     types: [ published ]
 
-# Builds & uploads kind2 & soteria_pp native binaries
-# Builds VERDICT source with Java and Maven
-# Uploads extern.zip and README.md to release page
-# Pushes verdict image to Docker Hub
-# Updates verdict-latest in VERDICT-update-sites
+# Runs release workflow and uploads build artifacts:
+# - Builds & uploads kind2 & soteria_pp native binaries
+# - Builds VERDICT source and runs unit tests
+# - Uploads extern.zip and README.md to release page
+# - Pushes verdict image to Docker Hub
+# - Updates verdict-latest in VERDICT-update-sites
 
 jobs:
   native-binaries:
@@ -83,20 +84,23 @@ jobs:
 
   release:
     needs: native-binaries
+    container:
+      image: maven:${{ matrix.maven-version }}
+      volumes:
+      - /usr/bin/docker:/usr/bin/docker
+      - /var/run/docker.sock:/var/run/docker.sock
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         distribution: [ temurin ]
         java-version: [ 17 ]
+        maven-version: [ 3.9.5 ]
         os: [ ubuntu-22.04 ]
 
     steps:
     - name: Check out VERDICT source
       uses: actions/[email protected]
 
-    - name: Set up GraphViz
-      uses: ts-graphviz/setup-graphviz@v1
-
     - name: Set up Java and Maven
       uses: actions/[email protected]
       with:
@@ -108,8 +112,6 @@ jobs:
       run: |
         mvn -B install -f tools/verdict-back-ends/verdict-bundle/z3-native-libs/pom.xml
         mvn -B package -f tools/pom.xml -Dtycho.localArtifacts=ignore
-      env:
-        GraphVizPath: /usr/bin
 
     - name: Download macOS binaries
       uses: actions/[email protected]
@@ -142,15 +144,15 @@ jobs:
           extern.zip
           docs/README.md
 
-    - name: Set up Docker Buildx
-      uses: docker/[email protected]
-
     - name: Login to Docker Hub
       uses: docker/[email protected]
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Set up Docker Buildx
+      uses: docker/[email protected]
+
     - name: Build and push verdict image
       uses: docker/[email protected]
       with:

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -491,7 +491,7 @@
           <configuration>
             <rules>
               <requireMavenVersion>
-                <version>[3.6.3,)</version>
+                <version>[3.9.0,)</version>
               </requireMavenVersion>
             </rules>
           </configuration>