diff --git a/.travis.yml b/.travis.yml index a0040b68b9..6a1a57bd99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,5 @@ language: java services: mongodb -install: mvn install -U -DskipTests=true -Pspring-snapshot -before_script: - - "gem install travis-artifacts" - - "mvn -version" -script: mvn install -nsu -Dmaven.test.redirectTestOutputToFile=true - -after_failure: - - "for f in `find . -name build.log`; do travis-artifacts upload --path $f; done" - -env: - global: - - "ARTIFACTS_AWS_REGION=us-east-1" - - "ARTIFACTS_S3_BUCKET=temp.springsource.com/spring-boot" - - secure: "JCQ1uz/rfrtMiUAvxeMznVB2wTX/f7lrCBa6oOsskDPt1dMzxD4aEuOfq3QlROLPDhYyu3dnWh1+ABla3Dx4+dCVA9ASgFCq5ivO5Vkxr4c6g8tb7hp14EitGEnWfEpdn64K6mZ7e7a/yjaXU3Ry4AisvPSk7wCcbHisBbj1LzE=" - - secure: "Dcya9JSXSa9qXDBXUihYxfCBL8VKCoIj5SQARMshYGLrs1zN2C4EcO4lcMkePTHWrGjpSqNdgnChUeg9YphWqODCcy2XhaMlSxwBYBDTye3hLGwKNdMKnrl/4yE+GoBg6Zaj9bB46Ua/GwLgZpOgM/b/VuCqnp6JC+hYOZKBhdg=" +install: mvn install -U -DskipTests=true -P spring-snapshot +script: mvn install -nsu -P '!integration' diff --git a/pom.xml b/pom.xml index 5be17f66d8..a5fc6365fc 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,14 @@ spring-boot-actuator spring-boot-starters spring-boot-cli + + + + integration + + true + + spring-boot-integration-tests diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index 16056369c8..cba7e2ba83 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -13,7 +13,19 @@ ${basedir}/.. org.springframework.boot.cli.SpringCli + default + + + integration + + true + + + integration + + + @@ -152,9 +164,12 @@ ${project.build.directory}/generated-resources + + ${spring.profiles.active} + - org.apache.maven.plugins @@ -263,7 +278,7 @@ - org.eclipse.m2e diff --git a/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-tools/spring-boot-loader/pom.xml index 1f72711acc..e1358aae0b 100644 --- a/spring-boot-tools/spring-boot-loader/pom.xml +++ b/spring-boot-tools/spring-boot-loader/pom.xml @@ -12,6 +12,39 @@ ${basedir}/../.. + + + integration + + true + + + + + maven-invoker-plugin + + ${project.build.directory}/it + src/it/settings.xml + ${project.build.directory}/local-repo + verify + true + ${skipTests} + true + + + + integration-test + + install + run + + + + + + + + org.slf4j @@ -24,29 +57,4 @@ test - - - - maven-invoker-plugin - - ${project.build.directory}/it - src/it/settings.xml - ${project.build.directory}/local-repo - verify - true - ${skipTests} - true - - - - integration-test - - install - run - - - - - - diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml index 40b3ab6cb3..0d27ee7c3b 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -12,6 +12,39 @@ ${basedir}/../.. + + + integration + + true + + + + + maven-invoker-plugin + + ${project.build.directory}/it + src/it/settings.xml + ${project.build.directory}/local-repo + verify + true + ${skipTests} + true + + + + integration-test + + install + run + + + + + + + + @@ -102,27 +135,6 @@ - - maven-invoker-plugin - - ${project.build.directory}/it - src/it/settings.xml - ${project.build.directory}/local-repo - verify - true - ${skipTests} - true - - - - integration-test - - install - run - - - -