Commit Graph

1213 Commits

Author SHA1 Message Date
44d944bceb Merge pull request from dougmorato/master
Maven-tomcat plugin fix and correct typo on JS file
2015-10-26 10:09:16 -04:00
91ea844c7f Merge pull request from nbaars/master
Cannot serialize session attribute, fix 
2015-10-26 09:59:20 -04:00
94ae466dbd Cannot serialize session attribute 2015-10-26 07:52:26 +01:00
2803b7cd84 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 <dm@corp.io>
2015-10-26 00:33:20 -04:00
398f918376 Coveralls goal abreviation
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-25 23:21:28 -04:00
f9073e366d 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 <dm@corp.io>
2015-10-25 23:13:50 -04:00
345e3cc7cb Fix typo on JS file
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-25 22:53:56 -04:00
441543100f 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 <dm@corp.io>
2015-10-25 22:51:28 -04:00
8bffb76e5b Merge pull request from misfir3/master
items ommited from menu spinner and some more clean up
2015-10-25 22:28:17 -04:00
f6a938ffd1 Merge pull request from dougmorato/master
Coveralls should be on Parent Pom
2015-10-24 20:26:39 -04:00
7e2d36ee48 Coveralls should be on Parent Pom
moving the coverall plugin to the parent pom level

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 20:26:17 -04:00
9eff95cf21 Merge pull request from dougmorato/master
Adding badges for Coverity, Coveralls and Codacy
2015-10-24 20:09:35 -04:00
2f8ac1798b Adding Codacy Badge on README
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 20:07:01 -04:00
27479c9a62 Fix typo on cobertura maven plugin pom.xml
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 19:55:23 -04:00
c8c3b75fbf 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 <dm@corp.io>
2015-10-24 19:49:20 -04:00
cffb515851 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 <dm@corp.io>
2015-10-24 19:40:39 -04:00
cd6a4bf2d2 Adding Coverity Scan Badge
Added Coverity Scan Badge on the README file

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 18:51:19 -04:00
ce11389a78 Merge pull request from dougmorato/master
Test enable Coverity SAST
2015-10-24 16:17:50 -04:00
fc0b781d4a Test enable Coverity SAST
Coverity is a cloud static code analysis tool, free for open-source projects. Enable scan submissions from travis CI

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 16:17:12 -04:00
a8577321a8 Merge pull request from dougmorato/master
Improved README instructions for Easy Run
2015-10-24 16:03:17 -04:00
95468581bc Improved README formatting
Formatting for the README file, adding a "Debugging and Troubleshooting" section and improving formatting for the reloading plugins and debugging label properties

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 15:53:18 -04:00
f1d72c92ae Improved README instructions for Easy Run
Improved README instructions for Easy Run, adding a website link to check for the last modifified data of the exec-jar
Added links for listing build artificats output and link to our Travis.CI job

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 15:31:15 -04:00
ab29afec3c code cleanup 2015-10-24 13:15:14 -05:00
fc2360b49b ... one more 2015-10-24 13:12:44 -05:00
2c7b4fbc96 Merge pull request from dougmorato/master
Copy whole target folder, not just individual file
2015-10-24 14:12:26 -04:00
e4b6ed0244 Copy whole target folder, not just individual file
Instead of copying jar/war artifact individually, copy the whole target folder to the "Deployable Artifacts", which will then be uploaded to Amazon S3

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 14:11:37 -04:00
e3df816fb9 omitted on earlier commit 2015-10-24 13:10:43 -05:00
d7ef02b06a Merge pull request from misfir3/master
Code cleanup and menu spinner
2015-10-24 13:49:33 -04:00
45db051f30 removing redundant line, adding hasPlan to special challenge case handling 2015-10-24 11:45:49 -05:00
d52dfe87c4 Merge remote-tracking branch 'upstream/master' 2015-10-24 09:12:02 -05:00
3c1336a033 : spinner implemented for menu loading 2015-10-23 15:15:57 -05:00
7648369dfd Merge pull request from nbaars/master
Logging in sometimes goes to report card and misses category-menu 
2015-10-23 07:02:21 +02:00
060b0cd8fa Logging in sometimes goes to report card and misses category-menu 2015-10-23 06:54:14 +02:00
ff9bae6290 Merge pull request from dougmorato/master
Copy output and target info upload to S3 folder
2015-10-22 19:10:48 -04:00
010a67744c Copy output and target info upload to S3 folder
Instead of moving the the jar and war files from target, copy these files and the target direcotry into the WEBGOAT_ARTIFACTS_FOLDER so it's all uploaded to S3

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-22 18:51:43 -04:00
648bd3bb95 code cleanup 2015-10-22 16:55:18 -05:00
36aebbe68c Merge pull request from span/close-button
Fix  to activate close button in the modal footer
2015-10-22 16:32:32 -04:00
c1e836360f Fix to activate close button in the modal footer 2015-10-22 22:14:09 +02:00
be0dc297e7 Merge pull request from span/deployment-descriptor
Fix  deployment descriptor elements in wrong order
2015-10-21 16:25:59 -04:00
325b964559 Fix deployment descriptor elements in wrong order and off white spacing 2015-10-21 21:57:35 +02:00
70ab7edbf1 Merge pull request from misfir3/master
: removing ace directory, not in use
2015-10-21 11:40:53 -04:00
28ea340307 : removing ace directory, not in use 2015-10-21 11:11:43 -04:00
1752df894e Merge pull request from nbaars/master
The jar snapshot doesn't run  (2)
2015-10-07 22:52:26 +02:00
f6c2c4bacb The jar snapshot doesn't run (2) 2015-10-07 22:47:39 +02:00
3c1cc87035 Merge pull request from nbaars/master
The jar snapshot doesn't run 
2015-10-07 22:27:04 +02:00
316771fde3 The jar snapshot doesn't run 2015-10-07 22:19:46 +02:00
7bdfb54ea1 Merge pull request from nbaars/master
Removed credits from lessons
2015-10-07 08:08:41 -04:00
e1829e209c Implemented lesson information which gives a mapping between the menu and the actual WebGoat-Lessons project. 2015-10-04 11:56:12 +02:00
a6a1b32939 Removed credits from lessons 2015-10-03 18:21:54 +02:00
16b8eeb439 Merge pull request from nbaars/master
Fixed classloading issues with Goathills lessons
2015-10-01 16:52:50 -04:00