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:06 UTC
[4/7] maven-surefire git commit: Move share compiler configuration
among projects
Move share compiler configuration among projects
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/81f3dda5
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/81f3dda5
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/81f3dda5
Branch: refs/heads/junit5
Commit: 81f3dda52af9805a46bab2e608c62ed1b0e6b9fd
Parents: 1ab033a
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Oct 9 15:32:10 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Nov 19 14:02:13 2016 +0100
----------------------------------------------------------------------
.../src/test/resources/junit4/pom.xml | 46 ++++++++------------
1 file changed, 18 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/81f3dda5/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 d685f5b..f277ceb 100644
--- a/surefire-integration-tests/src/test/resources/junit4/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4/pom.xml
@@ -28,9 +28,27 @@
<version>1.0-SNAPSHOT</version>
<name>Test for JUnit 4</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>junit4</id>
+
+ <properties>
+ <java.version>1.5</java.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -44,14 +62,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
@@ -77,24 +87,11 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.vintage.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>
@@ -130,13 +127,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>