This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new fb78211 CXF-8372: Update Maven Surefire to 3.0.0-M5 (#725)
fb78211 is described below
commit fb7821164ec6d7fb98dc3f8caea67465db230a14
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Nov 19 10:52:23 2020 -0500
CXF-8372: Update Maven Surefire to 3.0.0-M5 (#725)
CXF-8372: Update Maven Surefire to 3.0.0-M5
---
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 7 +------
pom.xml | 4 ++--
systests/microprofile/client/weld/pom.xml | 8 ++++++++
systests/spring-boot/pom.xml | 14 ++++++--------
systests/transports/pom.xml | 1 +
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index d57658b..5eded6d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,7 +31,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.4.0</spring.boot.version>
- <spring.cloud.eureka.version>3.0.0-M4</spring.cloud.eureka.version>
+ <spring.cloud.eureka.version>3.0.0-M5</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.34.v20201102</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.32.1</cxf.swagger.ui.version>
@@ -211,7 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M5</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cce56f..9f934aa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -479,6 +479,7 @@
<argLine>${cxf.surefire.fork.vmargs}
-D${cxf.jaxb.context.class.property}=${cxf.jaxb.context.class}</argLine>
<enableAssertions>${cxf.surefire.enable.assertions}</enableAssertions>
<parallel>${cxf.surefire.parallel.mode}</parallel>
+ <forkNode
implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
<systemPropertyVariables>
<java.io.tmpdir>${basedir}/target</java.io.tmpdir>
<cxf.useRandomFirstPort>true</cxf.useRandomFirstPort>
@@ -806,12 +807,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${cxf.junit5.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${cxf.junit.version}</version>
diff --git a/pom.xml b/pom.xml
index da12e02..3c8735b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,7 +476,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -546,7 +546,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/systests/microprofile/client/weld/pom.xml
b/systests/microprofile/client/weld/pom.xml
index a3e6551..86e5642 100644
--- a/systests/microprofile/client/weld/pom.xml
+++ b/systests/microprofile/client/weld/pom.xml
@@ -129,6 +129,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
@@ -142,6 +143,13 @@
<sse.server.port>${sse.server.port}</sse.server.port>
</systemPropertyVariables>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>3.0.0-M5</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml
index 8d62c40..11b8d95 100644
--- a/systests/spring-boot/pom.xml
+++ b/systests/spring-boot/pom.xml
@@ -138,14 +138,6 @@
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -153,5 +145,11 @@
<artifactId>spring-boot-starter-actuator</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${cxf.junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index aef4e6e..142d2c9 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -334,6 +334,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
+ <version>${cxf.junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
