Skip to content

Commit

Permalink
Update maven-surefire-plugin to 3.0.0-M3 to fix Java 8 classloader (#…
Browse files Browse the repository at this point in the history
…4344)

* Update maven-surefire-plugin to 3.0.0-M3 to fix Java 8 classloader

* Update failsafe plugin to 3.0.0-M3 too

* Specify maven-surefire-plugin version in bigtable-emulator
  • Loading branch information
chingor13 authored Jan 16, 2019
1 parent 052c4a9 commit fe59de2
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 16 deletions.
8 changes: 4 additions & 4 deletions google-cloud-clients/google-cloud-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<goals>
Expand All @@ -121,18 +121,18 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-clients/google-cloud-logging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-clients/google-cloud-spanner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>3.0.0-M3</version>
<configuration>
<excludedGroups>com.google.cloud.spanner.IntegrationTest</excludedGroups>
<reportNameSuffix>sponge_log</reportNameSuffix>
Expand All @@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<configuration>
<systemPropertyVariables>
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
Expand Down
6 changes: 3 additions & 3 deletions google-cloud-clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<configuration>
<!-- Excludes integration tests and smoke tests when unit tests are run -->
<excludes>
Expand Down Expand Up @@ -574,7 +574,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -906,7 +906,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<configuration>
<excludes>
<exclude>**/IT*.java</exclude>
Expand Down Expand Up @@ -223,7 +223,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M3</version>
<configuration>
<excludes combine.self="override"></excludes>
</configuration>
Expand Down
5 changes: 5 additions & 0 deletions google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
</plugins>
</build>

Expand Down
6 changes: 3 additions & 3 deletions google-cloud-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>3.0.0-M3</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>3.0.0-M3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.17</version>
<version>3.0.0-M3</version>
</dependency>
</dependencies>
</plugin>
Expand Down

0 comments on commit fe59de2

Please sign in to comment.