This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch MNG-7129-maven-caching
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-7129-maven-caching by this 
push:
     new 50c42ef  Fix CI build
50c42ef is described below

commit 50c42efe580d18ecbd9e5027fd68838f9fff3801
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Dec 10 14:21:29 2021 +0100

    Fix CI build
---
 .github/workflows/maven.yml                          | 13 ++++++++++---
 pom.xml                                              | 11 +++++++++++
 src/test/projects/build-extension/pom.xml            |  2 +-
 src/test/projects/core-extension/.mvn/extensions.xml |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a42c97f..3d2b04d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -50,10 +50,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build maven distributions
+      - name: Build maven 3 distribution
+        working-directory: ./maven/maven3
         run: |
-          mvn install -DskipTests -P versionlessMavenDist -f "maven/maven3"
-          mvn install -DskipTests -P versionlessMavenDist -f "maven/maven4"
+          mvn -V help:evaluate -Dexpression=maven.multiModuleProjectDirectory
+          mvn install -DskipTests -P versionlessMavenDist
+
+      - name: Build maven 4 distribution
+        working-directory: ./maven/maven4
+        run: |
+          mvn -V help:evaluate -Dexpression=maven.multiModuleProjectDirectory
+          mvn install -DskipTests -P versionlessMavenDist
 
       - name: Build with Maven
         run: mvn install -e -B -V
diff --git a/pom.xml b/pom.xml
index 4c3e54c..7f57960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,17 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>pre-integration-test</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/test/projects/build-extension/pom.xml 
b/src/test/projects/build-extension/pom.xml
index d2afd81..142306d 100644
--- a/src/test/projects/build-extension/pom.xml
+++ b/src/test/projects/build-extension/pom.xml
@@ -32,7 +32,7 @@
     <build>
         <extensions>
             <extension>
-                <groupId>org.apache.maven.caching</groupId>
+                <groupId>org.apache.maven.extensions</groupId>
                 <artifactId>maven-caching-extension</artifactId>
                 <version>1.0.0-SNAPSHOT</version>
             </extension>
diff --git a/src/test/projects/core-extension/.mvn/extensions.xml 
b/src/test/projects/core-extension/.mvn/extensions.xml
index 6c56e85..caff17f 100644
--- a/src/test/projects/core-extension/.mvn/extensions.xml
+++ b/src/test/projects/core-extension/.mvn/extensions.xml
@@ -18,7 +18,7 @@
 -->
 <extensions>
     <extension>
-        <groupId>org.apache.maven.caching</groupId>
+        <groupId>org.apache.maven.extensions</groupId>
         <artifactId>maven-caching-extension</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </extension>

Reply via email to