Simplify to one example build that is run against multiple maven vers…

…ions

.github/workflows/gradle-enterprise-conventions-maven-extension-verification.yml

@@ -19,6 +19,7 @@ jobs:
         with:
           java-version: '8'
           distribution: 'temurin'
+          cache: maven
       - name: Build Gradle Enterprise Conventions Maven Extension
         run: ./mvnw clean install -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com
         working-directory: gradle-enterprise-conventions-maven-extension/extension
@@ -35,11 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - name: 'Maven 3.6.x'
-            directory: 'maven_3.6.x'
-          - name: 'Maven 3.9.x'
-            directory: 'maven_3.9.x'
+        maven-version: ['3.6.3', '3.8.8', '3.9.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,13 +45,19 @@ jobs:
         with:
           java-version: '8'
           distribution: 'temurin'
+          cache: maven
       - name: Download Extension
         uses: actions/download-artifact@v3
         with:
           name: gradle-enterprise-conventions-maven-extension
           path: ~/.m2/repository/com/example/gradle-enterprise-conventions-maven-extension
-      - name: Verify Maven ${{ matrix.name }} Example Build
+      - name: Verify Example Build for Maven ${{ matrix.maven-version }}
+        run: ./mvnw wrapper:wrapper -Dmaven=${{ matrix.maven-version }} -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com
+        working-directory: gradle-enterprise-conventions-maven-extension/example-build
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
+      - name: Verify Example Build for Maven ${{ matrix.maven-version }}
         run: ./mvnw clean verify -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com
-        working-directory: gradle-enterprise-conventions-maven-extension/example-builds/${{ matrix.directory }}
+        working-directory: gradle-enterprise-conventions-maven-extension/example-build
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}

gradle-enterprise-conventions-maven-extension/README.md

@@ -31,7 +31,7 @@ This project demonstrates how to share a common Gradle Enterprise configuration
 This project contains the following:
 
 * `extension` - Contains the example convention extension that applies and configures Gradle Enterprise on projects
-* `example-builds` - A set of example builds that apply the convention extension for various Maven versions
+* `example-build` - An example build that applies the convention extension
 
 ### Running the example builds
 
@@ -42,11 +42,11 @@ cd extension
 ./mvnw clean install
 ```
 
-Once the extension is published, then you can run the example builds under `example-builds` using the Maven wrapper:
+Once the extension is published, then you can run the example build under `example-build` using the Maven wrapper:
 
 ```bash
-cd example-builds/maven_3.9.x
-./mvnw clean install
+cd example-build
+./mvnw clean verify
 ```
 
 ## Differences with the Common Custom User Data Maven extension

gradle-enterprise-conventions-maven-extension/example-builds/maven_3.6.x/pom.xml → gradle-enterprise-conventions-maven-extension/example-build/pom.xml

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <version>1.0</version>
 
-    <name>Maven 3.6.x Conventions Extension Sample Build</name>
+    <name>Maven Conventions Extension Sample Build</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>