From 8e594c790edf7f52d1a05f5dc9830f3d69bbb4c3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 24 Feb 2015 12:44:19 -0800 Subject: [PATCH] Fix eclipse errors and warnings Fix some eclipse errors and warnings caused by XSD validation errors and classes in the wrong place. --- spring-boot-deployment-tests/pom.xml | 1 + .../spring-boot-gradle-tests/pom.xml | 5 +++++ .../springframework/boot/gradle/BootRunResourceTests.java | 0 .../src/test/resources/boot-run-resources/build.gradle | 0 .../src/main/java/BootRunResourcesApplication.java | 0 .../boot-run-resources/src/main/resources/test.txt | 0 .../src/main/resources/integration-context.xml | 4 ++-- .../src/main/resources/integration-context.xml | 6 +++--- 8 files changed, 11 insertions(+), 5 deletions(-) rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java (100%) rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/boot-run-resources/build.gradle (100%) rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java (100%) rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/boot-run-resources/src/main/resources/test.txt (100%) diff --git a/spring-boot-deployment-tests/pom.xml b/spring-boot-deployment-tests/pom.xml index f270c5bc00..e6564323dd 100644 --- a/spring-boot-deployment-tests/pom.xml +++ b/spring-boot-deployment-tests/pom.xml @@ -18,6 +18,7 @@ ${basedir}/.. + 1.7 spring-boot-deployment-test-tomee diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml index 3982944c82..267c3f7592 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml @@ -30,6 +30,11 @@ spring-boot-dependency-tools test + + org.springframework.boot + spring-boot + test + diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java similarity index 100% rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java diff --git a/spring-boot-integration-tests/src/test/resources/boot-run-resources/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle similarity index 100% rename from spring-boot-integration-tests/src/test/resources/boot-run-resources/build.gradle rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/build.gradle diff --git a/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java similarity index 100% rename from spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java diff --git a/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt similarity index 100% rename from spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/boot-run-resources/src/main/resources/test.txt diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml b/spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml index 6b8f92e816..d8fb07e789 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-file="http://www.springframework.org/schema/integration/file" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-4.1.xsd + http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml b/spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml index 6b8f92e816..76e3b38663 100644 --- a/spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml +++ b/spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-file="http://www.springframework.org/schema/integration/file" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-4.1.xsd + http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - +