diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index eee384fc381..7026be1e776 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -182,7 +182,6 @@ 3.1.0 ${javax-mail.version} 1.5.0 - 6.10 3.0.11.RELEASE 3.0.4.RELEASE 2.3.0 @@ -2966,11 +2965,6 @@ nio-multipart-parser ${nio-multipart-parser.version} - - org.testng - testng - ${testng.version} - org.thymeleaf thymeleaf diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 82bcf95c601..bff0ad0b463 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -27,6 +27,7 @@ 1.1.1 1.0-groovy-2.4 1.10.6 + 6.14.3 1.0.6.RELEASE 0.1.0.BUILD-SNAPSHOT @@ -246,6 +247,11 @@ import pom + + org.testng + testng + ${testng.version} + org.zeroturnaround zt-zip diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNG.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java similarity index 76% rename from spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNG.java rename to spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java index 7349825ae43..b11d0b739cd 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNG.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,8 @@ import org.testng.annotations.Test; import org.springframework.context.annotation.Configuration; -/** - * Abstract test with nest {@code @Configuration} and {@code @Test} used by - * {@link TestTypeExcludeFilter}. - * - * @author EddĂș MelĂ©ndez - */ @Test -public abstract class AbstractTestNG { +public abstract class AbstractTestNgTestWithConfig { @Configuration static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java index ba66b544f2b..400d931830b 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,9 +99,10 @@ public class TestTypeExcludeFilterTests { } @Test - public void matchesNestedConfigurationClassWithoutTestngAnnotation() + public void matchesNestedConfigurationClassWithoutTestNgAnnotation() throws Exception { - assertThat(this.filter.match(getMetadataReader(AbstractTestNG.Config.class), + assertThat(this.filter.match( + getMetadataReader(AbstractTestNgTestWithConfig.Config.class), this.metadataReaderFactory)).isTrue(); }