Merge branch 'release/v8.0.0.M21'

Build release when tag is set
Merge tag 'v8.0.0.M20' into develop
2018-06-20 18:23:59 +02:00 · 2018-06-20 18:22:35 +02:00 · 2018-06-20 18:06:26 +02:00 · 2018-06-20 18:06:17 +02:00 · 2018-06-20 18:05:59 +02:00 · 2018-06-20 18:05:06 +02:00
27 changed files with 28 additions and 38 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -28,12 +28,6 @@ deploy:
    on:
      repo: WebGoat/WebGoat
      tags: true
-  - provider: script
-    skip_cleanup: true
-    script: bash scripts/deploy-webgoat.sh
-    on:
-      repo: WebGoat/WebGoat
-      branch: develop
  - provider: releases
    skip_cleanup: true
    overwrite: true
--- a/pom.xml
+++ b/pom.xml
@ -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>
--- a/scripts/deploy-webgoat.sh
+++ b/scripts/deploy-webgoat.sh
@ -6,7 +6,7 @@ export REPO=webgoat/webgoat-8.0
 cd webgoat-server
 ls target/

-if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${TRAVIS_TAG}" ]; then
  # If we push a tag to master this will update the LATEST Docker image and tag with the version number
  docker build --build-arg webgoat_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
  docker push $REPO
@ -27,14 +27,10 @@ cd ..
 cd webwolf
 ls target/

-if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then
+if [ ! -z "${TRAVIS_TAG}" ]; then
  # If we push a tag to master this will update the LATEST Docker image and tag with the version number
  docker build --build-arg webwolf_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
  docker push $REPO
-elif [ ! -z "${TRAVIS_TAG}" ]; then
-  # Creating a tag build we push it to Docker with that tag
-  docker build --build-arg webwolf_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:${TRAVIS_TAG} -t $REPO:latest .
-  docker push $REPO
 else
  echo "Skipping releasing to DockerHub because it is a build of branch ${BRANCH}"
 fi
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@ -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>
--- a/webgoat-lessons/auth-bypass/pom.xml
+++ b/webgoat-lessons/auth-bypass/pom.xml
@ -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>
--- a/webgoat-lessons/bypass-restrictions/pom.xml
+++ b/webgoat-lessons/bypass-restrictions/pom.xml
@ -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>
--- a/webgoat-lessons/challenge/pom.xml
+++ b/webgoat-lessons/challenge/pom.xml
@ -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>


--- a/webgoat-lessons/client-side-filtering/pom.xml
+++ b/webgoat-lessons/client-side-filtering/pom.xml
@ -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>
--- a/webgoat-lessons/cross-site-scripting/pom.xml
+++ b/webgoat-lessons/cross-site-scripting/pom.xml
@ -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>
--- a/webgoat-lessons/csrf/pom.xml
+++ b/webgoat-lessons/csrf/pom.xml
@ -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>
--- a/webgoat-lessons/html-tampering/pom.xml
+++ b/webgoat-lessons/html-tampering/pom.xml
@ -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>
--- a/webgoat-lessons/http-basics/pom.xml
+++ b/webgoat-lessons/http-basics/pom.xml
@ -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>
--- a/webgoat-lessons/http-proxies/pom.xml
+++ b/webgoat-lessons/http-proxies/pom.xml
@ -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>
--- a/webgoat-lessons/idor/pom.xml
+++ b/webgoat-lessons/idor/pom.xml
@ -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>
--- a/webgoat-lessons/insecure-deserialization/pom.xml
+++ b/webgoat-lessons/insecure-deserialization/pom.xml
@ -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>
--- a/webgoat-lessons/insecure-login/pom.xml
+++ b/webgoat-lessons/insecure-login/pom.xml
@ -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>
--- a/webgoat-lessons/jwt/pom.xml
+++ b/webgoat-lessons/jwt/pom.xml
@ -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>
--- a/webgoat-lessons/missing-function-ac/pom.xml
+++ b/webgoat-lessons/missing-function-ac/pom.xml
@ -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>
--- a/webgoat-lessons/password-reset/pom.xml
+++ b/webgoat-lessons/password-reset/pom.xml
@ -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>
--- a/webgoat-lessons/pom.xml
+++ b/webgoat-lessons/pom.xml
@ -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>
--- a/webgoat-lessons/sql-injection/pom.xml
+++ b/webgoat-lessons/sql-injection/pom.xml
@ -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>
--- a/webgoat-lessons/vulnerable-components/pom.xml
+++ b/webgoat-lessons/vulnerable-components/pom.xml
@ -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>
--- a/webgoat-lessons/webgoat-introduction/pom.xml
+++ b/webgoat-lessons/webgoat-introduction/pom.xml
@ -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>
--- a/webgoat-lessons/webwolf-introduction/pom.xml
+++ b/webgoat-lessons/webwolf-introduction/pom.xml
@ -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>
--- a/webgoat-lessons/xxe/pom.xml
+++ b/webgoat-lessons/xxe/pom.xml
@ -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>
--- a/webgoat-server/pom.xml
+++ b/webgoat-server/pom.xml
@ -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>
--- a/webwolf/pom.xml
+++ b/webwolf/pom.xml
@ -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>
Author	SHA1	Message	Date
Nanne Baars	3536fd0b6d	Merge branch 'release/v8.0.0.M21'	2018-06-20 18:23:59 +02:00
Nanne Baars	bc84e8f207	Build release when tag is set	2018-06-20 18:22:35 +02:00
Nanne Baars	14dbd47675	Merge tag 'v8.0.0.M20' into develop New release M20	2018-06-20 18:06:26 +02:00
Nanne Baars	898dd90c6f	Merge branch 'release/v8.0.0.M20'	2018-06-20 18:06:17 +02:00
Nanne Baars	ac12a009e4	New release v8.0.0.M20	2018-06-20 18:05:59 +02:00
Nanne Baars	699b1bfd89	Only do releases and Docker updates when building master	2018-06-20 18:05:06 +02:00
Nanne Baars	ad77a7ab24	Merge tag 'v8.0.0.M19' into develop New release M19	2018-06-20 16:40:44 +02:00