diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 7dfff3cf85..3d31600f00 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -1345,4 +1345,4 @@ - + \ No newline at end of file diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml index efd5bd098b..2ac52747d3 100644 --- a/spring-boot-full-build/pom.xml +++ b/spring-boot-full-build/pom.xml @@ -56,7 +56,6 @@ ../spring-boot-cli ../spring-boot-samples ../spring-boot-integration-tests - ../spring-boot-security-tests ../spring-boot-docs diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml index 04808c9f14..42774fdf18 100644 --- a/spring-boot-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -8,7 +8,7 @@ ../spring-boot-parent spring-boot-integration-tests - jar + pom Spring Boot Integration Tests Spring Boot Integration Tests http://projects.spring.io/spring-boot/ @@ -19,19 +19,10 @@ ${basedir}/.. - - - org.gradle - gradle-tooling-api - ${gradle.version} - test - - - org.springframework.boot - spring-boot-dependency-tools - test - - + + spring-boot-gradle-tests + spring-boot-security-tests + default @@ -45,6 +36,7 @@ is available --> org.apache.maven.plugins maven-invoker-plugin + false src/it/settings.xml ${main.basedir}/spring-boot-samples/ @@ -69,6 +61,7 @@ org.apache.maven.plugins maven-antrun-plugin + false clean-samples @@ -89,6 +82,7 @@ org.apache.maven.plugins maven-clean-plugin + false clean-samples @@ -106,16 +100,4 @@ full - - - gradle - http://repo.gradle.org/gradle/libs-releases-local - - true - - - false - - - diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml new file mode 100644 index 0000000000..1504156ab3 --- /dev/null +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-integration-tests + 1.1.11.BUILD-SNAPSHOT + + spring-boot-gradle-tests + jar + Spring Boot Gradle Integration Tests + Spring Boot Gradle Integration Tests + http://projects.spring.io/spring-boot/ + + Pivotal Software, Inc. + http://www.spring.io + + + ${basedir}/../.. + + + + org.gradle + gradle-tooling-api + ${gradle.version} + test + + + org.springframework.boot + spring-boot-dependency-tools + test + + + + + gradle + http://repo.gradle.org/gradle/libs-releases-local + + true + + + false + + + + diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java similarity index 97% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java index b7cfa637d7..26245cd2f2 100644 --- a/spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java @@ -60,7 +60,7 @@ public class StarterDependenciesIntegrationTests { @Parameters public static List getStarters() { List starters = new ArrayList(); - for (File file : new File("../spring-boot-starters").listFiles()) { + for (File file : new File("../../spring-boot-starters").listFiles()) { if (file.isDirectory() && new File(file, "pom.xml").exists()) { String name = file.getName(); if (name.startsWith(STARTER_NAME_PREFIX) diff --git a/spring-boot-integration-tests/src/test/resources/classifier-extension.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/classifier-extension.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle diff --git a/spring-boot-integration-tests/src/test/resources/classifier.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/classifier.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle diff --git a/spring-boot-integration-tests/src/test/resources/custom-version-management.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-version-management.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/custom-version-management.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-version-management.gradle diff --git a/spring-boot-integration-tests/src/test/resources/custom-versions.properties b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-versions.properties similarity index 100% rename from spring-boot-integration-tests/src/test/resources/custom-versions.properties rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-versions.properties diff --git a/spring-boot-integration-tests/src/test/resources/flatdir.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/flatdir.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle diff --git a/spring-boot-integration-tests/src/test/resources/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/foo.jar similarity index 100% rename from spring-boot-integration-tests/src/test/resources/foo.jar rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/foo.jar diff --git a/spring-boot-integration-tests/src/test/resources/install-app.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/install-app.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle diff --git a/spring-boot-integration-tests/src/test/resources/installer-io.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer-io.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/installer-io.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer-io.gradle diff --git a/spring-boot-integration-tests/src/test/resources/installer.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/installer.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle diff --git a/spring-boot-integration-tests/src/test/resources/main-in-run.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/main-in-run.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle diff --git a/spring-boot-integration-tests/src/test/resources/nojar.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/nojar.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle diff --git a/spring-boot-integration-tests/src/test/resources/repackage.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/repackage.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java similarity index 100% rename from spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java similarity index 100% rename from spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java diff --git a/spring-boot-integration-tests/src/test/resources/starter-dependencies.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/starter-dependencies.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle diff --git a/spring-boot-integration-tests/src/test/resources/war-packaging.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/war-packaging.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle diff --git a/spring-boot-security-tests/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/pom.xml similarity index 86% rename from spring-boot-security-tests/pom.xml rename to spring-boot-integration-tests/spring-boot-security-tests/pom.xml index ce335a6228..bd4acb18f4 100644 --- a/spring-boot-security-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-security-tests/pom.xml @@ -3,9 +3,8 @@ 4.0.0 org.springframework.boot - spring-boot-parent + spring-boot-integration-tests 1.1.11.BUILD-SNAPSHOT - ../spring-boot-parent spring-boot-security-tests pom @@ -16,6 +15,9 @@ Pivotal Software, Inc. http://www.spring.io + + ${basedir}/.. + spring-boot-security-tests-web-helloworld diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml similarity index 96% rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml index 81d38d0825..893f5a0711 100644 --- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml +++ b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml @@ -16,7 +16,7 @@ http://www.spring.io - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java similarity index 100% rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java similarity index 100% rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java