Skip to content

Commit

Permalink
Merge branch 'release/v8.0.0.M20'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nbaars
nbaars committed Jun 20, 2018
2 parents b727859 + ac12a00 commit 898dd90
Show file tree
Hide file tree
Showing 26 changed files with 28 additions and 32 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ deploy:
on:
repo: WebGoat/WebGoat
tags: true
- provider: script
skip_cleanup: true
script: bash scripts/deploy-webgoat.sh
on:
repo: WebGoat/WebGoat
branch: develop
branch: master
- provider: releases
skip_cleanup: true
overwrite: true
Expand All @@ -45,6 +40,7 @@ deploy:
on:
repo: WebGoat/WebGoat
tags: true
branch: master
env:
global:
#Docker login
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<packaging>pom</packaging>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>

<name>WebGoat Parent Pom</name>
<description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/auth-bypass/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/bypass-restrictions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/challenge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/client-side-filtering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/cross-site-scripting/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/csrf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/html-tampering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/http-basics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/http-proxies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/idor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/insecure-deserialization/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/insecure-login/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/jwt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/missing-function-ac/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/password-reset/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions webgoat-lessons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<packaging>pom</packaging>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>

<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/sql-injection/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/vulnerable-components/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-lessons/webgoat-introduction/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/webwolf-introduction/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion webgoat-lessons/xxe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion webgoat-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion webwolf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>v8.0.0.M19</version>
<version>v8.0.0.M20</version>
</parent>

<dependencies>
Expand Down

0 comments on commit 898dd90

Please sign in to comment.