From cd6a4bf2d2adb65adf0b9ef52b8604fb73dc78d8 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sat, 24 Oct 2015 18:51:19 -0400 Subject: [PATCH 1/5] Adding Coverity Scan Badge Added Coverity Scan Badge on the README file Signed-off-by: Doug Morato --- README.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/README.MD b/README.MD index 816a90b14..4f7ee50a0 100644 --- a/README.MD +++ b/README.MD @@ -1,6 +1,7 @@ # WebGoat: A deliberately insecure Web Application [![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg)](https://travis-ci.org/WebGoat/WebGoat) +[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/6101.svg)](https://scan.coverity.com/projects/webgoat-webgoat) # Important Information From cffb515851c7a7cddcbea2e7583cde7ae1e6f11f Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sat, 24 Oct 2015 19:40:39 -0400 Subject: [PATCH 2/5] Adding Coveralls support Coveralls.IO is free service to report on Code Coverage for Open-Source projects. Enabling the reporting using the maven cobertura plugin Signed-off-by: Doug Morato --- .travis.yml | 2 ++ README.MD | 1 + pom.xml | 6 ++++-- webgoat-container/pom.xml | 22 +++++++++++++++++++++- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8561aac74..4be1097c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,8 @@ deploy: repo: WebGoat/WebGoat branch: master jdk: oraclejdk8 +after_success: + - mvn clean cobertura:cobertura coveralls:report notifications: slack: secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA= diff --git a/README.MD b/README.MD index 4f7ee50a0..4b5bd6bbd 100644 --- a/README.MD +++ b/README.MD @@ -2,6 +2,7 @@ [![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg)](https://travis-ci.org/WebGoat/WebGoat) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/6101.svg)](https://scan.coverity.com/projects/webgoat-webgoat) +[![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=master&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master) # Important Information diff --git a/pom.xml b/pom.xml index 1eeabeca6..001ba2354 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,7 @@ 1.2 1.2 1.7 + 2.7s 3.1 1.8.1 0.2 @@ -121,6 +122,7 @@ 1.4 3.3.2 1.1.3 + 4.0.0 1.4.2 18.0 1.4.187 @@ -137,7 +139,7 @@ 1.2.17 1.4.2 3.1 - 2.18.1 + 2.19 1.6 2.6 2.10.3 @@ -154,7 +156,7 @@ 3.2.4.RELEASE 1.1.2 2.2.2 - 2.1 + 2.2 1.5.1 7.0.63 diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml index da62e8822..323fdd5af 100644 --- a/webgoat-container/pom.xml +++ b/webgoat-container/pom.xml @@ -28,7 +28,7 @@ org.apache.tomcat.maven tomcat7-maven-plugin - 2.2 + ${tomcat7-maven-plugin.version} local_tomcat http://localhost:8080/manager @@ -207,6 +207,26 @@ + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls-maven-plugin.version} + + + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura-maven-plugin.version} + + + xml + 256m + + true + + From c8c3b75fbf773a943d87c806b2695d7df856a76a Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sat, 24 Oct 2015 19:49:20 -0400 Subject: [PATCH 3/5] Coverity scans only on specific branch Instead of running coverity scans on every commit on the master branch, run scan only on the coverity_scan branch Signed-off-by: Doug Morato --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4be1097c3..a842c64f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,5 +46,5 @@ addons: notification_email: doug.morato@owasp.org build_command_prepend: "mvn clean" build_command: "mvn -DskipTests=true install" - branch_pattern: master + branch_pattern: coverity_scan From 27479c9a62268e2c994eb4238fdd205fc433ae2a Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sat, 24 Oct 2015 19:55:23 -0400 Subject: [PATCH 4/5] Fix typo on cobertura maven plugin pom.xml Signed-off-by: Doug Morato --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 001ba2354..e5789998a 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 1.2 1.2 1.7 - 2.7s + 2.7 3.1 1.8.1 0.2 From 2f8ac1798ba40d51a81509361d578d5aaa0f3e30 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sat, 24 Oct 2015 20:07:01 -0400 Subject: [PATCH 5/5] Adding Codacy Badge on README Signed-off-by: Doug Morato --- README.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.MD b/README.MD index 4b5bd6bbd..d15beff4f 100644 --- a/README.MD +++ b/README.MD @@ -3,6 +3,8 @@ [![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg)](https://travis-ci.org/WebGoat/WebGoat) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/6101.svg)](https://scan.coverity.com/projects/webgoat-webgoat) [![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=master&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master) +[![Codacy Badge](https://api.codacy.com/project/badge/b69ee3a86e3b4afcaf993f210fccfb1d)](https://www.codacy.com/app/dm/WebGoat) + # Important Information