Skip to content

Commit 4b7b5fd

Browse files
slawekjaranowskislawekjaranowski
committed
Try to fix it tests
1 parent 4d71ae9 commit 4b7b5fd

File tree

8 files changed

+47
-44
lines changed

8 files changed

+47
-44
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ jobs:
5050
${{ runner.os }}-maven-
5151
5252
- name: Build with Maven
53-
run: mvn install -e -B -V -P${{ matrix.maven }}
53+
run: mvn verify -e -B -V -P${{ matrix.maven }} -P run-its
5454

‎pom.xml‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ under the License.
4545
<minimalJavaBuildVersion>11</minimalJavaBuildVersion>
4646
<classWorldsVersion>2.6.0</classWorldsVersion>
4747

48+
<!-- default maven version, can be override by maven3 profile -->
49+
<mavenVersion>4.0.0-alpha-2</mavenVersion>
50+
<maven.dir>maven4</maven.dir>
51+
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
52+
4853
<formatter-maven-plugin.version>2.20.0</formatter-maven-plugin.version>
4954
<impsort-maven-plugin.version>1.7.0</impsort-maven-plugin.version>
5055

@@ -434,32 +439,6 @@ under the License.
434439
<excludes>**/its/**</excludes>
435440
</configuration>
436441
</execution>
437-
<execution>
438-
<id>integration-test</id>
439-
<phase>integration-test</phase>
440-
<goals>
441-
<goal>test</goal>
442-
</goals>
443-
<configuration>
444-
<includes>**/its/**</includes>
445-
<systemPropertyVariables>
446-
<project.version>${project.version}</project.version>
447-
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
448-
<maven.basedir>${maven.basedir}</maven.basedir>
449-
</systemPropertyVariables>
450-
</configuration>
451-
</execution>
452-
</executions>
453-
</plugin>
454-
<plugin>
455-
<groupId>org.apache.maven.plugins</groupId>
456-
<artifactId>maven-install-plugin</artifactId>
457-
<version>3.0.1</version>
458-
<executions>
459-
<execution>
460-
<id>default-install</id>
461-
<phase>pre-integration-test</phase>
462-
</execution>
463442
</executions>
464443
</plugin>
465444
<plugin>
@@ -471,6 +450,39 @@ under the License.
471450
</build>
472451

473452
<profiles>
453+
<profile>
454+
<id>run-its</id>
455+
<build>
456+
<plugins>
457+
<plugin>
458+
<groupId>org.apache.maven.plugins</groupId>
459+
<artifactId>maven-surefire-plugin</artifactId>
460+
<version>3.0.0-M7</version>
461+
<configuration>
462+
<systemPropertyVariables>
463+
<!-- local repo provided by m-invoker-p:install -->
464+
<localRepo>${project.build.directory}/local-repo</localRepo>
465+
<projectVersion>${project.version}</projectVersion>
466+
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
467+
<maven.basedir>${maven.basedir}</maven.basedir>
468+
</systemPropertyVariables>
469+
</configuration>
470+
<executions>
471+
<execution>
472+
<id>integration-test</id>
473+
<phase>integration-test</phase>
474+
<goals>
475+
<goal>test</goal>
476+
</goals>
477+
<configuration>
478+
<includes>**/its/**</includes>
479+
</configuration>
480+
</execution>
481+
</executions>
482+
</plugin>
483+
</plugins>
484+
</build>
485+
</profile>
474486
<profile>
475487
<id>maven3</id>
476488
<properties>
@@ -479,17 +491,6 @@ under the License.
479491
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
480492
</properties>
481493
</profile>
482-
<profile>
483-
<id>maven4</id>
484-
<activation>
485-
<activeByDefault>true</activeByDefault>
486-
</activation>
487-
<properties>
488-
<mavenVersion>4.0.0-alpha-2</mavenVersion>
489-
<maven.dir>maven4</maven.dir>
490-
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
491-
</properties>
492-
</profile>
493494
</profiles>
494495

495496
</project>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ public Object resolveParameter( ParameterContext parameterContext,
208208

209209
Verifier verifier = new Verifier( testExecutionDir.toString(), true );
210210
verifier.setLogFileName( "../log.txt" );
211+
verifier.setSystemProperty( "projectVersion", System.getProperty( "projectVersion" ) );
212+
verifier.setLocalRepo( System.getProperty( "localRepo" ) );
211213
return verifier;
212214
}
213215
catch ( VerificationException | IOException e )

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<extension>
3535
<groupId>org.apache.maven.extensions</groupId>
3636
<artifactId>maven-build-cache-extension</artifactId>
37-
<version>1.0.0-SNAPSHOT</version>
37+
<version>${projectVersion}</version>
3838
</extension>
3939
</extensions>
4040
</build>
4141

42-
</project>
42+
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<extension>
2121
<groupId>org.apache.maven.extensions</groupId>
2222
<artifactId>maven-build-cache-extension</artifactId>
23-
<version>1.0.0-SNAPSHOT</version>
23+
<version>${projectVersion}</version>
2424
</extension>
2525
</extensions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<extension>
2121
<groupId>org.apache.maven.extensions</groupId>
2222
<artifactId>maven-build-cache-extension</artifactId>
23-
<version>1.0.0-SNAPSHOT</version>
23+
<version>${projectVersion}</version>
2424
</extension>
2525
</extensions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<extension>
2020
<groupId>org.apache.maven.extensions</groupId>
2121
<artifactId>maven-build-cache-extension</artifactId>
22-
<version>1.0.0-SNAPSHOT</version>
22+
<version>${projectVersion}</version>
2323
</extension>
2424
</extensions>
2525
<plugins>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<extension>
1919
<groupId>org.apache.maven.extensions</groupId>
2020
<artifactId>maven-build-cache-extension</artifactId>
21-
<version>1.0.0-SNAPSHOT</version>
21+
<version>${projectVersion}</version>
2222
</extension>
2323
</extensions>

0 commit comments

Comments
 (0)