[MBUILDCACHE-34] Improve IT test execution

- IT tests should use separate local repository - version of tested component should be parameterized

Author: slawekjaranowski

.github/workflows/maven.yml

@@ -50,5 +50,5 @@ jobs:
  ${{ runner.os }}-maven-
 
  - name: Build with Maven
- run: mvn install -e -B -V -P${{ matrix.maven }}
+ run: mvn verify -e -B -V -P${{ matrix.maven }} -P run-its
 

pom.xml

@@ -45,6 +45,11 @@ under the License.
  <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
  <classWorldsVersion>2.6.0</classWorldsVersion>
 
+ <!-- default maven version, can be override by maven3 profile -->
+ <mavenVersion>4.0.0-alpha-2</mavenVersion>
+ <maven.dir>maven4</maven.dir>
+ <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
+
  <formatter-maven-plugin.version>2.20.0</formatter-maven-plugin.version>
  <impsort-maven-plugin.version>1.7.0</impsort-maven-plugin.version>
 
@@ -434,32 +439,6 @@ under the License.
  <excludes>**/its/**</excludes>
  </configuration>
  </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>**/its/**</includes>
- <systemPropertyVariables>
- <project.version>${project.version}</project.version>
- <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- <maven.basedir>${maven.basedir}</maven.basedir>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>default-install</id>
- <phase>pre-integration-test</phase>
- </execution>
  </executions>
  </plugin>
  <plugin>
@@ -471,6 +450,39 @@ under the License.
  </build>
 
  <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M7</version>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- local repo provided by m-invoker-p:install -->
+ <localRepo>${project.build.directory}/local-repo</localRepo>
+ <projectVersion>${project.version}</projectVersion>
+ <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
+ <maven.basedir>${maven.basedir}</maven.basedir>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>**/its/**</includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
  <profile>
  <id>maven3</id>
  <properties>
@@ -479,17 +491,6 @@ under the License.
  <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
  </properties>
  </profile>
- <profile>
- <id>maven4</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <mavenVersion>4.0.0-alpha-2</mavenVersion>
- <maven.dir>maven4</maven.dir>
- <maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
- </properties>
- </profile>
  </profiles>
 
 </project>

src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java

@@ -208,6 +208,8 @@ public Object resolveParameter( ParameterContext parameterContext,
 
  Verifier verifier = new Verifier( testExecutionDir.toString(), true );
  verifier.setLogFileName( "../log.txt" );
+ verifier.setSystemProperty( "projectVersion", System.getProperty( "projectVersion" ) );
+ verifier.setLocalRepo( System.getProperty( "localRepo" ) );
  return verifier;
  }
  catch ( VerificationException | IOException e )

src/test/projects/build-extension/pom.xml

@@ -34,9 +34,9 @@
  <extension>
  <groupId>org.apache.maven.extensions</groupId>
  <artifactId>maven-build-cache-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${projectVersion}</version>
  </extension>
  </extensions>
  </build>
 
-</project>
+</project>

src/test/projects/core-extension/.mvn/extensions.xml

@@ -20,6 +20,6 @@
  <extension>
  <groupId>org.apache.maven.extensions</groupId>
  <artifactId>maven-build-cache-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${projectVersion}</version>
  </extension>
 </extensions>

src/test/projects/forked-executions-core-extension/.mvn/extensions.xml

@@ -20,6 +20,6 @@
  <extension>
  <groupId>org.apache.maven.extensions</groupId>
  <artifactId>maven-build-cache-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${projectVersion}</version>
  </extension>
 </extensions>

src/test/projects/mbuildcache-21/pom.xml

@@ -19,7 +19,7 @@
  <extension>
  <groupId>org.apache.maven.extensions</groupId>
  <artifactId>maven-build-cache-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${projectVersion}</version>
  </extension>
  </extensions>
  <plugins>

src/test/projects/remote-cache-dav/.mvn/extensions.xml

@@ -18,6 +18,6 @@
  <extension>
  <groupId>org.apache.maven.extensions</groupId>
  <artifactId>maven-build-cache-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${projectVersion}</version>
  </extension>
 </extensions>