From 441543100f86eb8fd07016ec89dd4ee4e47f0214 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sun, 25 Oct 2015 22:51:28 -0400 Subject: [PATCH 1/5] Revert tomcat7 maven plugin to 2.1 Knonw bug on version 2.2 of the tomcat7-maven-plugin on extracting the temp directories for exec jar Info: https://issues.apache.org/jira/browse/MTOMCAT-211 https://fisheye6.atlassian.com/changelog/tomcat?cs=1539956 https://fisheye6.atlassian.com/changelog/tomcat?cs=1539209 Signed-off-by: Doug Morato --- pom.xml | 2 +- webgoat-container/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ba4d1d652..816690fc8 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 3.2.4.RELEASE 1.1.2 2.2.2 - 2.2 + 2.1 1.5.1 7.0.63 diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml index 9f9fc90f5..c2908d96b 100644 --- a/webgoat-container/pom.xml +++ b/webgoat-container/pom.xml @@ -173,7 +173,7 @@ ${tomcat7-maven-plugin.version} local_tomcat - http://localhost:8080/manager + http://localhost:8080/manager/text /WebGoat exec true From 345e3cc7cbb50b9d657434d75b2166bc416dd571 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sun, 25 Oct 2015 22:53:56 -0400 Subject: [PATCH 2/5] Fix typo on JS file Signed-off-by: Doug Morato --- .../src/main/webapp/js/goatApp/model/LessonInfoModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js b/webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js index 83419e336..acba0e70a 100644 --- a/webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js +++ b/webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js @@ -17,4 +17,4 @@ define(['jquery', } }); -});6 \ No newline at end of file +}); \ No newline at end of file From f9073e366d61783df2c4e757e5232eaab88d7de7 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sun, 25 Oct 2015 23:13:50 -0400 Subject: [PATCH 3/5] Tomcat7 maven plugin now uses 2.3-snapshot Until a production release of tomcat7-maven-plugin is made available, use a snapshot version Signed-off-by: Doug Morato --- pom.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 816690fc8..435ff7507 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 3.2.4.RELEASE 1.1.2 2.2.2 - 2.1 + 2.3-SNAPSHOT 1.5.1 7.0.63 @@ -172,6 +172,21 @@ + + + apache.snapshots + http://repository.apache.org/snapshots/ + + + daily + + + daily + + + + release From 398f918376c7b036c78088c7e2990e8e5ff5642d Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Sun, 25 Oct 2015 23:21:28 -0400 Subject: [PATCH 4/5] Coveralls goal abreviation Signed-off-by: Doug Morato --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85ca20b54..a842c64f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ deploy: branch: master jdk: oraclejdk8 after_success: - - mvn clean cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report + - mvn clean cobertura:cobertura coveralls:report notifications: slack: secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA= From 2803b7cd8430457ad81a003d55a291f9d73790d8 Mon Sep 17 00:00:00 2001 From: Doug Morato Date: Mon, 26 Oct 2015 00:33:04 -0400 Subject: [PATCH 5/5] Adding VersionEye VersionEye is a free service for open-source repositories that track and report the versions of all dependencies in a project Signed-off-by: Doug Morato --- .travis.yml | 1 + README.MD | 2 +- pom.xml | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a842c64f7..bad904c40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ deploy: branch: master jdk: oraclejdk8 after_success: + - mvn versioneye:update - mvn clean cobertura:cobertura coveralls:report notifications: slack: diff --git a/README.MD b/README.MD index d15beff4f..aa04aca54 100644 --- a/README.MD +++ b/README.MD @@ -4,7 +4,7 @@ [![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) - +[![Dependency Status](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa/badge.svg?style=flat)](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa) # Important Information diff --git a/pom.xml b/pom.xml index 435ff7507..50b033c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,7 @@ 2.3-SNAPSHOT 1.5.1 7.0.63 + 3.5.1 @@ -282,6 +283,15 @@ true + + com.versioneye + versioneye-maven-plugin + ${versioneye-maven-plugin.version} + + a1e4a9da4ed34ee44cab + 562da95be346d7000e0369ac + +