You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/11/04 07:41:11 UTC
[maven-build-cache-extension] branch fix-tests created (now a7135ae)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch fix-tests
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
at a7135ae Try to fix it tests
This branch includes the following new commits:
new a7135ae Try to fix it tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-build-cache-extension] 01/01: Try to fix it tests
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch fix-tests
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
commit a7135ae15ac4e4b818c1f317ab3348be928f09e4
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Nov 4 08:40:50 2022 +0100
Try to fix it tests
---
pom.xml | 10 +++++-----
.../maven/buildcache/its/junit/IntegrationTestExtension.java | 1 +
src/test/projects/build-extension/pom.xml | 4 ++--
src/test/projects/core-extension/.mvn/extensions.xml | 2 +-
.../forked-executions-core-extension/.mvn/extensions.xml | 2 +-
src/test/projects/mbuildcache-21/pom.xml | 2 +-
src/test/projects/remote-cache-dav/.mvn/extensions.xml | 2 +-
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 479a610..4faeded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,11 @@ under the License.
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
</environmentVariables>
+ <systemPropertyVariables>
+ <projectVersion>${project.version}</projectVersion>
+ <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
+ <maven.basedir>${maven.basedir}</maven.basedir>
+ </systemPropertyVariables>
</configuration>
<executions>
<execution>
@@ -442,11 +447,6 @@ under the License.
</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>
diff --git a/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
index 7a5442c..f9e0a20 100644
--- a/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
+++ b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
@@ -208,6 +208,7 @@ public class IntegrationTestExtension implements BeforeAllCallback, BeforeEachCa
Verifier verifier = new Verifier( testExecutionDir.toString(), true );
verifier.setLogFileName( "../log.txt" );
+ verifier.setSystemProperty( "projectVersion", System.getProperty( "projectVersion" ) );
return verifier;
}
catch ( VerificationException | IOException e )
diff --git a/src/test/projects/build-extension/pom.xml b/src/test/projects/build-extension/pom.xml
index bf282b8..f5265b4 100644
--- a/src/test/projects/build-extension/pom.xml
+++ b/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>
\ No newline at end of file
+</project>
diff --git a/src/test/projects/core-extension/.mvn/extensions.xml b/src/test/projects/core-extension/.mvn/extensions.xml
index a344134..8df78f8 100644
--- a/src/test/projects/core-extension/.mvn/extensions.xml
+++ b/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>
diff --git a/src/test/projects/forked-executions-core-extension/.mvn/extensions.xml b/src/test/projects/forked-executions-core-extension/.mvn/extensions.xml
index a344134..8df78f8 100644
--- a/src/test/projects/forked-executions-core-extension/.mvn/extensions.xml
+++ b/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>
diff --git a/src/test/projects/mbuildcache-21/pom.xml b/src/test/projects/mbuildcache-21/pom.xml
index 63e440c..31b54ce 100644
--- a/src/test/projects/mbuildcache-21/pom.xml
+++ b/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>
diff --git a/src/test/projects/remote-cache-dav/.mvn/extensions.xml b/src/test/projects/remote-cache-dav/.mvn/extensions.xml
index c2ab1d4..15c170e 100644
--- a/src/test/projects/remote-cache-dav/.mvn/extensions.xml
+++ b/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>