Commit 0f51e87
Moving surefire-junit4 out of the dependency lists to allow others to better run tests. (googleapis#4058)
* Try adding maven-surefire-plugin as a plugin to pull the correct surefire-junit.
* Let's move the surefire-junit4 out of util as well to be consistant.
* Fix indentation in pom1 parent e8f8526 commit 0f51e87
2 files changed
Lines changed: 36 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -93,11 +93,6 @@ | |||
| 93 | 93 | <artifactId>grpc-testing</artifactId> | |
| 94 | 94 | <scope>test</scope> | |
| 95 | 95 | </dependency> | |
| 96 | - <dependency> | ||
| 97 | - <groupId>org.apache.maven.surefire</groupId> | ||
| 98 | - <artifactId>surefire-junit4</artifactId> | ||
| 99 | - <version>2.19.1</version> | ||
| 100 | - </dependency> | ||
| 101 | 96 | </dependencies> | |
| 102 | 97 | <profiles> | |
| 103 | 98 | <profile> | |
@@ -130,13 +125,24 @@ | |||
| 130 | 125 | <perCoreThreadCount>true</perCoreThreadCount> | |
| 131 | 126 | <threadCount>2</threadCount> | |
| 132 | 127 | </configuration> | |
| 133 | - <dependencies> | ||
| 134 | - <dependency> | ||
| 135 | - <groupId>org.apache.maven.surefire</groupId> | ||
| 136 | - <artifactId>surefire-junit4</artifactId> | ||
| 137 | - <version>2.19.1</version> | ||
| 138 | - </dependency> | ||
| 139 | - </dependencies> | ||
| 128 | + <dependencies> | ||
| 129 | + <dependency> | ||
| 130 | + <groupId>org.apache.maven.surefire</groupId> | ||
| 131 | + <artifactId>surefire-junit4</artifactId> | ||
| 132 | + <version>2.19.1</version> | ||
| 133 | + </dependency> | ||
| 134 | + </dependencies> | ||
| 135 | + </plugin> | ||
| 136 | + <plugin> | ||
| 137 | + <artifactId>maven-surefire-plugin</artifactId> | ||
| 138 | + <version>2.19.1</version> | ||
| 139 | + <dependencies> | ||
| 140 | + <dependency> | ||
| 141 | + <groupId>org.apache.maven.surefire</groupId> | ||
| 142 | + <artifactId>surefire-junit4</artifactId> | ||
| 143 | + <version>2.19.1</version> | ||
| 144 | + </dependency> | ||
| 145 | + </dependencies> | ||
| 140 | 146 | </plugin> | |
| 141 | 147 | </plugins> | |
| 142 | 148 | </build> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -96,11 +96,6 @@ | |||
| 96 | 96 | <artifactId>grpc-testing</artifactId> | |
| 97 | 97 | <scope>test</scope> | |
| 98 | 98 | </dependency> | |
| 99 | - <dependency> | ||
| 100 | - <groupId>org.apache.maven.surefire</groupId> | ||
| 101 | - <artifactId>surefire-junit4</artifactId> | ||
| 102 | - <version>2.19.1</version> | ||
| 103 | - </dependency> | ||
| 104 | 99 | </dependencies> | |
| 105 | 100 | <profiles> | |
| 106 | 101 | <profile> | |
@@ -133,13 +128,24 @@ | |||
| 133 | 128 | <perCoreThreadCount>true</perCoreThreadCount> | |
| 134 | 129 | <threadCount>2</threadCount> | |
| 135 | 130 | </configuration> | |
| 136 | - <dependencies> | ||
| 137 | - <dependency> | ||
| 138 | - <groupId>org.apache.maven.surefire</groupId> | ||
| 139 | - <artifactId>surefire-junit4</artifactId> | ||
| 140 | - <version>2.19.1</version> | ||
| 141 | - </dependency> | ||
| 142 | - </dependencies> | ||
| 131 | + <dependencies> | ||
| 132 | + <dependency> | ||
| 133 | + <groupId>org.apache.maven.surefire</groupId> | ||
| 134 | + <artifactId>surefire-junit4</artifactId> | ||
| 135 | + <version>2.19.1</version> | ||
| 136 | + </dependency> | ||
| 137 | + </dependencies> | ||
| 138 | + </plugin> | ||
| 139 | + <plugin> | ||
| 140 | + <artifactId>maven-surefire-plugin</artifactId> | ||
| 141 | + <version>2.19.1</version> | ||
| 142 | + <dependencies> | ||
| 143 | + <dependency> | ||
| 144 | + <groupId>org.apache.maven.surefire</groupId> | ||
| 145 | + <artifactId>surefire-junit4</artifactId> | ||
| 146 | + <version>2.19.1</version> | ||
| 147 | + </dependency> | ||
| 148 | + </dependencies> | ||
| 143 | 149 | </plugin> | |
| 144 | 150 | </plugins> | |
| 145 | 151 | </build> | |
0 commit comments