Skip to content

Commit 35feb8f

Browse files
author
Sam Laane
committed
Try adding maven-surefire-plugin as a plugin to pull the correct surefire-junit.
1 parent c4e45c7 commit 35feb8f

File tree

3 files changed

+51
-29
lines changed
  • google-cloud-clients

3 files changed

+51
-29
lines changed

‎google-cloud-clients/google-cloud-bigtable-admin/pom.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@
9393
<artifactId>grpc-testing</artifactId>
9494
<scope>test</scope>
9595
</dependency>
96-
<dependency>
97-
<groupId>org.apache.maven.surefire</groupId>
98-
<artifactId>surefire-junit4</artifactId>
99-
<version>2.19.1</version>
100-
</dependency>
10196
</dependencies>
10297
<profiles>
10398
<profile>
@@ -130,13 +125,24 @@
130125
<perCoreThreadCount>true</perCoreThreadCount>
131126
<threadCount>2</threadCount>
132127
</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>
140146
</plugin>
141147
</plugins>
142148
</build>

‎google-cloud-clients/google-cloud-bigtable/pom.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@
9696
<artifactId>grpc-testing</artifactId>
9797
<scope>test</scope>
9898
</dependency>
99-
<dependency>
100-
<groupId>org.apache.maven.surefire</groupId>
101-
<artifactId>surefire-junit4</artifactId>
102-
<version>2.19.1</version>
103-
</dependency>
10499
</dependencies>
105100
<profiles>
106101
<profile>
@@ -133,13 +128,24 @@
133128
<perCoreThreadCount>true</perCoreThreadCount>
134129
<threadCount>2</threadCount>
135130
</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>
143149
</plugin>
144150
</plugins>
145151
</build>

‎google-cloud-clients/google-cloud-logging/pom.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,20 @@
8888
<classifier>testlib</classifier>
8989
<scope>test</scope>
9090
</dependency>
91-
<dependency>
92-
<groupId>org.apache.maven.surefire</groupId>
93-
<artifactId>surefire-junit4</artifactId>
94-
<version>2.19.1</version>
95-
</dependency>
9691
</dependencies>
92+
<build>
93+
<plugins>
94+
<plugin>
95+
<artifactId>maven-surefire-plugin</artifactId>
96+
<version>2.19.1</version>
97+
<dependencies>
98+
<dependency>
99+
<groupId>org.apache.maven.surefire</groupId>
100+
<artifactId>surefire-junit4</artifactId>
101+
<version>2.19.1</version>
102+
</dependency>
103+
</dependencies>
104+
</plugin>
105+
</plugins>
106+
</build>
97107
</project>

0 commit comments

Comments
 (0)