Releasing v8.0.0.M2

Directory can already exists
Copy jar files to directory for Github release
2017-10-18 22:36:58 +02:00 · 2017-10-18 22:26:46 +02:00 · 2017-10-18 22:14:04 +02:00 · 2017-10-18 21:39:52 +02:00 · 2017-10-18 21:08:59 +02:00 · 2017-10-18 20:57:57 +02:00
25 changed files with 40 additions and 30 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,6 +11,15 @@ script:
 cache:
  directories:
  - "$HOME/.m2"
+before_deploy:
+  - export WEBGOAT_SERVER_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-server/target
+  - export WEBWOLF_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webwolf/target
+  - export WEBGOAT_ARTIFACTS_FOLDER=$HOME/build/$TRAVIS_REPO_SLUG/Deployable_Artifacts/
+  - mkdir -p $WEBGOAT_ARTIFACTS_FOLDER
+  - cp -fa $WEBGOAT_SERVER_TARGET_DIR/*.jar $WEBGOAT_ARTIFACTS_FOLDER/
+  - cp -fa $WEBWOLF_TARGET_DIR/*.jar $WEBGOAT_ARTIFACTS_FOLDER/
+  - echo "Contents of artifacts folder:"
+  - ls $WEBGOAT_ARTIFACTS_FOLDER
 deploy:
  - provider: script
    skip_cleanup: true
@ -25,10 +34,12 @@ deploy:
      repo: WebGoat/WebGoat
      branch: develop
  - provider: releases
+    skip_cleanup: true
    api_key:
      #api-key from webgoat-github user
      secure: pJOLBnl6427PcVg/tVy/qB18JC7b8cKpffau+IP0pjdSt7KUfBdBY3QuJ7mrM65zRoVILzggLckaew2PlRmYQRdumyWlyRn44XiJ9KO4n6Bsufbz+ictB4ggtozpp9+I9IIUh1TmqypL9lhkX2ONM9dSHmyblYpAAgMuYSK8FYc=
-    file: "webgoat-server/target/webgoat-server*.jar"
+    file_glob: true
+    file: $WEBGOAT_ARTIFACTS_FOLDER/*
    on:
      repo: WebGoat/WebGoat
      tags: true
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@
    <groupId>org.owasp.webgoat</groupId>
    <artifactId>webgoat-parent</artifactId>
    <packaging>pom</packaging>
-    <version>8.0.0.M1</version>
+    <version>8.0.0.M2</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
@ -7,13 +7,11 @@ cd webgoat-server

 if [ "${BRANCH}" == "master" ] && [ ! -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 -f Dockerfile -t $REPO:latest .
-  docker tag $REPO:${TRAVIS_TAG}
+  docker build --build-arg webgoat_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 -f Dockerfile -t $REPO:${TRAVIS_TAG} .
-  docker tag $REPO:${TRAVIS_TAG}
+  docker build --build-arg webgoat_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:${TRAVIS_TAG} .
  docker push $REPO
 elif [ "${BRANCH}" == "develop" ]; then
  docker build -f Dockerfile -t $REPO:snapshot .
--- 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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>

 </project>
--- 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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>

 </project>
--- 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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>

 </project>
--- 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>8.0.0.M1</version>
+    <version>8.0.0.M2</version>

    <parent>
        <groupId>org.owasp.webgoat</groupId>
        <artifactId>webgoat-parent</artifactId>
-        <version>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>
    <dependencies>
        <dependency>
--- 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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>

    <dependencies>
--- a/webgoat-server/Dockerfile
+++ b/webgoat-server/Dockerfile
@ -1,10 +1,11 @@
 FROM openjdk:8-jre-slim

+ARG webgoat_version=8.0-SNAPSHOT
+
 RUN useradd --home-dir /home/webgoat --create-home -U webgoat

 RUN apt-get update; apt-get install curl -y

-
 COPY start.sh /home/webgoat/start.sh
 RUN chmod +x /home/webgoat/start.sh

@ -12,4 +13,4 @@ USER webgoat
 RUN mkdir -p /home/webgoat/.embedmongo/linux
 RUN curl -o /home/webgoat/.embedmongo/linux/mongodb-linux-x86_64-3.2.2.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.2.tgz
 RUN cd /home/webgoat/; mkdir -p .webgoat
-COPY target/webgoat-server-8.0-SNAPSHOT.jar /home/webgoat/webgoat.jar
+COPY target/webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
--- 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>8.0.0.M1</version>
+        <version>8.0.0.M2</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>8.0.0.M1</version>
+        <version>8.0.0.M2</version>
    </parent>

    <dependencies>
Author	SHA1	Message	Date
Nanne Baars	bb3bc9b883	Releasing v8.0.0.M2	2017-10-18 22:36:58 +02:00
Nanne Baars	bb5e0c06dd	Directory can already exists	2017-10-18 22:26:46 +02:00
Nanne Baars	0508859cf5	Copy jar files to directory for Github release	2017-10-18 22:14:04 +02:00
Nanne Baars	738b2d8054	Skipping the clean-up while releasing to Github	2017-10-18 21:39:52 +02:00
Nanne Baars	0c88dcf463	Bug when passing version to Docker (v8.0 should be 8.0)	2017-10-18 21:08:59 +02:00
Nanne Baars	d1729e8f3c	Adding version number to Dockerfile as variable	2017-10-18 20:57:57 +02:00
Nanne Baars	1ecb43092d	Bumped version number	2017-10-18 19:58:14 +02:00
Nanne Baars	904a6b363d	Fixing Docker build	2017-10-18 19:52:57 +02:00