Merge branch 'master' into BAEL-2762

# Conflicts: # spring-boot-security/pom.xml # spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/SpringBootSecurityApplication.java # spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicAuthConfiguration.java # spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicAuthConfigurationIntegrationTest.java
2019-03-21 14:13:01 +03:00
parent 26f8de5834 ec33e1372d
commit 5421b1af95
489 changed files with 8849 additions and 4438 deletions
@@ -18,7 +18,6 @@ import java.net.URL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootSecurityApplication.class)
 public class BasicAuthConfigurationIntegrationTest {