From e8e5e0ad0307dcf7bad1616cfae9cbf6c789c0ef Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 15 Sep 2020 16:26:30 +0200
Subject: [PATCH] Run integration tests separate from unit tests

See gh-582.
---
 pom.xml                                       | 29 ++++++++++++++++++-
 ...rnetesAuthenticationIntegrationTests.java} |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)
 rename spring-vault-core/src/test/java/org/springframework/vault/config/{EnvironmentVaultConfigurationKubernetesAuthenticationUnitTests.java => EnvironmentVaultConfigurationKubernetesAuthenticationIntegrationTests.java} (96%)

diff --git a/pom.xml b/pom.xml
index 36e477cc..573b165c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,28 @@
 					</includes>
 					<excludes>
 						<exclude>**/Abstract*.java</exclude>
+						<exclude>**/*IntegrationTests*.java</exclude>
 					</excludes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<runOrder>random</runOrder>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					<includes>
+						<include>**/*IntegrationTests.java</include>
+					</includes>
 					<systemPropertyVariables>
 						<jdk.tls.client.protocols>TLSv1.2</jdk.tls.client.protocols>
 					</systemPropertyVariables>
@@ -440,7 +461,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.0.0-M5</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>3.0.0-M5</version>
 				</plugin>
 
 				<plugin>
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationIntegrationTests.java
similarity index 96%
rename from spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationUnitTests.java
rename to spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationIntegrationTests.java
index 6a6de748..29b8acba 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationUnitTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationKubernetesAuthenticationIntegrationTests.java
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ExtendWith(VaultExtension.class)
 @TestPropertySource(properties = { "vault.uri=https://localhost:8123", "vault.authentication=kubernetes",
 		"vault.kubernetes.role=my-role", "vault.kubernetes.service-account-token-file=target/token" })
-class EnvironmentVaultConfigurationKubernetesAuthenticationUnitTests {
+class EnvironmentVaultConfigurationKubernetesAuthenticationIntegrationTests {
 
 	@Configuration
 	@Import(EnvironmentVaultConfiguration.class)