dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container

Browse Source 
Conflicts:
	src/main/java/org/owasp/webgoat/session/Course.java
This commit is contained in:
nbaars
2015-02-23 20:33:22 +01:00
parent a815692149 4c30957a2d
commit 6e25026391
3 changed files with 606 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -48,7 +48,9 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archiveClasses>true</archiveClasses>
<!-- archiving the classes breaks the admin screen loads in course.java
the legacy lesson loader does not look in jar files for lessons -->
<archiveClasses>false</archiveClasses>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>