diff --git a/.travis.yml b/.travis.yml index d5847b004..8559934a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jdk: install: "/bin/true" script: - mvn clean install - - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -Prun-integration-tests clean install; else mvn clean install; fi + - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" clean install; else mvn clean install; fi cache: directories: - $HOME/.m2 diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml index 4ee368b5b..b75ff052a 100644 --- a/webgoat-container/pom.xml +++ b/webgoat-container/pom.xml @@ -17,85 +17,6 @@ org.owasp.webgoat.WebGoat - - - run-integration-tests - - false - - run-integration - true - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.3-SNAPSHOT - - local_tomcat - http://localhost:8080/manager - /WebGoat - exec - true - true - ${project.basedir}/src/main/old/WEB-INF/context.xml - - - - org.owasp.webgoat - webgoat-container - ${project.version} - - - - - tomcat-run - - exec-war-only - - package - - - tomcat-startup - pre-integration-test - - run-war-only - - - 8888 - true - - - - - tomcat-shutdown - post-integration-test - - shutdown - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - - integration-test - verify - - - - - - - - - @@ -217,11 +138,11 @@ true - - - - - + + + + +