Skip to content

Commit

Permalink
Fixing the functional testcases together with Travis CI which stopped…
Browse files Browse the repository at this point in the history
… due to excessive logging from the Tomcat 7 Maven plugin
  • Loading branch information
nbaars committed Sep 19, 2016
1 parent 6919b15 commit 0687b08
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 112 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ jdk:
- oraclejdk8
install: "/bin/true"
script:
- mvn clean install
- mvn clean install -q
- git clone -b develop https://github.com/WebGoat/WebGoat-Lessons.git
- mvn -file ./WebGoat-Lessons/pom.xml clean package
- mvn -file ./WebGoat-Lessons/pom.xml clean package -q
- cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -Prun-integration-tests clean install; else mvn clean install; fi
# Start the container this will make sure we do not see the debug logging of the Tomcat 7 Maven plugin
# which seems to always be set to DEBUG this will fail the build because we generate too much logging
- nohup bash -c "java -jar ./webgoat-standalone/target/webgoat-standalone-7.1-SNAPSHOT-exec.jar --port 8888 2>&1 &"
- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" clean install failsafe:integration-test; else mvn failsafe:integration-test; fi
cache:
directories:
- $HOME/.m2
Expand Down
Loading

0 comments on commit 0687b08

Please sign in to comment.