Moving surefire-junit4 out of the dependency lists to allow others to…

… better run tests. (#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 pom
googleapis · Nov 28, 2018 · 52566f4 · 52566f4
1 parent 0fd8b71
commit 52566f4
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 34 deletions.
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -93,11 +93,6 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-	  <version>2.19.1</version>
-    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -130,13 +125,24 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
-		<dependencies>
- 		  <dependency>
- 			<groupId>org.apache.maven.surefire</groupId>
- 			<artifactId>surefire-junit4</artifactId>
-			<version>2.19.1</version>
- 		  </dependency>
- 		</dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.19.1</version>
-    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -133,13 +128,24 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
-	<dependencies>
-	  <dependency>
-	    <groupId>org.apache.maven.surefire</groupId>
-	    <artifactId>surefire-junit4</artifactId>
-	    <version>2.19.1</version>
-	  </dependency>
-	</dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -88,10 +88,20 @@
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.19.1</version>
-    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
@@ -19,15 +19,21 @@
       <artifactId>maven-surefire-plugin</artifactId>
       <version>2.17</version>
       <scope>test</scope>
-    </dependency>
-	<dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.17</version>
     </dependency>
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.17</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.17</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>