You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/12/02 04:03:09 UTC
[7/7] maven-surefire git commit: Move engines into plugin declaration
Move engines into plugin declaration
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e4a5247a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e4a5247a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e4a5247a
Branch: refs/heads/junit5
Commit: e4a5247a74ad95d4b79c074402c959414dfa2732
Parents: 31b5592
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Nov 22 21:16:37 2016 +0100
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Nov 22 21:16:37 2016 +0100
----------------------------------------------------------------------
.../maven/surefire/its/JUnit4VersionsIT.java | 10 +++----
.../src/test/resources/junit4/pom.xml | 29 +++++++-------------
2 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4a5247a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
index 2df3b1c..3d8eb1b 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
@@ -88,11 +88,6 @@ public class JUnit4VersionsIT
@Parameter
public JUnitVersion version;
- private SurefireLauncher unpack()
- {
- return unpack( "/junit4", version.toString() );
- }
-
@Test
public void testJunit()
throws Exception
@@ -106,4 +101,9 @@ public class JUnit4VersionsIT
version.configure( unpack() ).executeTest().verifyErrorFree( 1 );
}
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit4", version.toString() );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e4a5247a/surefire-integration-tests/src/test/resources/junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4/pom.xml b/surefire-integration-tests/src/test/resources/junit4/pom.xml
index 57e66b8..f107e65 100644
--- a/surefire-integration-tests/src/test/resources/junit4/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4/pom.xml
@@ -89,15 +89,6 @@
<junit.platform.version>1.0.0-M2</junit.platform.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -109,6 +100,11 @@
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -123,15 +119,6 @@
<junit.platform.version>1.0.0-M2</junit.platform.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -143,6 +130,11 @@
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -150,5 +142,4 @@
</profile>
</profiles>
-
</project>