diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e235a5f20..d9c2d3878 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,102 +4,102 @@ on:
tags:
- v*
jobs:
-# release:
-# name: Release WebGoat
-# runs-on: ubuntu-latest
-# steps:
-# - uses: actions/checkout@v2
-#
-# - name: "Get tag name"
-# id: tag
-# uses: dawidd6/action-get-tag@v1
-#
-# - name: Set up JDK 11
-# uses: actions/setup-java@v1
-# with:
-# java-version: 11
-# architecture: x64
-#
-# - name: Cache Maven packages
-# uses: actions/cache@v2.1.4
-# with:
-# path: ~/.m2
-# key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-# restore-keys: ${{ runner.os }}-m2
-#
-# - name: "Set labels for ${{ github.ref }}"
-# run: |
-# echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
-# WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
-# echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
-# - name: Build with Maven
-# run: |
-# mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
-# mvn clean install -DskipTests
-#
-# - name: "Create release"
-# uses: softprops/action-gh-release@v1
-# with:
-# draft: false
-# files: |
-# webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-# webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-# body: |
-# ## Version ${{ steps.tag.outputs.tag }}
-#
-# ### New functionality
-#
-# - test
-#
-# ### Bug fixes
-#
-# - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
-#
-#
-# ## Contributors
-#
-# Special thanks to the following contributors providing us with a pull request:
-#
-# - Person 1
-# - Person 2
-#
-# And everyone who provided feedback through Github.
-#
-#
-# Team WebGoat
-# env:
-# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#
-# - name: "Set up QEMU"
-# uses: docker/setup-qemu-action@v1
-#
-# - name: "Set up Docker Buildx"
-# uses: docker/setup-buildx-action@v1
-#
-# - name: "Login to dockerhub"
-# uses: docker/login-action@v1
-# with:
-# username: ${{ secrets.DOCKERHUB_USERNAME }}
-# password: ${{ secrets.DOCKERHUB_TOKEN }}
-#
-# - name: "Build and push"
-# uses: docker/build-push-action@v2
-# with:
-# context: ./docker
-# file: docker/Dockerfile
-# push: false #todo enable
-# platforms: linux/amd64
-# tags: |
-# webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
-# webgoat/goatandwolf:latest
-# build-args: |
-# webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
-#
-# - name: "Image digest"
-# run: echo ${{ steps.docker_build.outputs.digest }}
+ release:
+ name: Release WebGoat
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: "Get tag name"
+ id: tag
+ uses: dawidd6/action-get-tag@v1
+
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ architecture: x64
+
+ - name: Cache Maven packages
+ uses: actions/cache@v2.1.4
+ with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+
+ - name: "Set labels for ${{ github.ref }}"
+ run: |
+ echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
+ WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
+ echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
+ - name: Build with Maven
+ run: |
+ mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+ mvn clean install -DskipTests
+
+ - name: "Create release"
+ uses: softprops/action-gh-release@v1
+ with:
+ draft: false
+ files: |
+ webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+ webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+ body: |
+ ## Version ${{ steps.tag.outputs.tag }}
+
+ ### New functionality
+
+ - test
+
+ ### Bug fixes
+
+ - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+
+
+ ## Contributors
+
+ Special thanks to the following contributors providing us with a pull request:
+
+ - Person 1
+ - Person 2
+
+ And everyone who provided feedback through Github.
+
+
+ Team WebGoat
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: "Set up QEMU"
+ uses: docker/setup-qemu-action@v1
+
+ - name: "Set up Docker Buildx"
+ uses: docker/setup-buildx-action@v1
+
+ - name: "Login to dockerhub"
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ - name: "Build and push"
+ uses: docker/build-push-action@v2
+ with:
+ context: ./docker
+ file: docker/Dockerfile
+ push: false #todo enable
+ platforms: linux/amd64
+ tags: |
+ webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
+ webgoat/goatandwolf:latest
+ build-args: |
+ webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+
+ - name: "Image digest"
+ run: echo ${{ steps.docker_build.outputs.digest }}
new_version:
name: Update development version
-# needs: [ release ]
+ needs: [ release ]
runs-on: ubuntu-latest
environment:
name: release
@@ -125,4 +125,4 @@ jobs:
git config user.email owasp.webgoat@gmail.com
find . -name 'pom.xml' | xargs git add
git commit -m "Updating to the new development version"
- git push
+ git push
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 7733d0939..954e779fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ webgoat.properties
webgoat.script
TestClass.class
**/*.flattened-pom.xml
+/.gitconfig
diff --git a/docker/pom.xml b/docker/pom.xml
index 7af51a13e..224610dde 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 8e3959518..2c27c7f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat
webgoat-parent
pom
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
WebGoat Parent Pom
Parent Pom for the WebGoat Project. A deliberately insecure Web Application
@@ -134,7 +134,6 @@
3.1.1
3.1.0
3.0.0-M4
- 8.2.0-SNAPSHOT
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index 0363d9437..ea820dae5 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -9,7 +9,7 @@
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-integration-tests/pom.xml b/webgoat-integration-tests/pom.xml
index f2514da0f..0690413d4 100644
--- a/webgoat-integration-tests/pom.xml
+++ b/webgoat-integration-tests/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/auth-bypass/pom.xml b/webgoat-lessons/auth-bypass/pom.xml
index 6cefc9d83..3578e8972 100644
--- a/webgoat-lessons/auth-bypass/pom.xml
+++ b/webgoat-lessons/auth-bypass/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/bypass-restrictions/pom.xml b/webgoat-lessons/bypass-restrictions/pom.xml
index 4ed518cf6..c940b8c63 100755
--- a/webgoat-lessons/bypass-restrictions/pom.xml
+++ b/webgoat-lessons/bypass-restrictions/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/challenge/pom.xml b/webgoat-lessons/challenge/pom.xml
index 0134f5236..9f064f853 100644
--- a/webgoat-lessons/challenge/pom.xml
+++ b/webgoat-lessons/challenge/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/chrome-dev-tools/pom.xml b/webgoat-lessons/chrome-dev-tools/pom.xml
index 4ced9f0ee..d2091f893 100644
--- a/webgoat-lessons/chrome-dev-tools/pom.xml
+++ b/webgoat-lessons/chrome-dev-tools/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/cia/pom.xml b/webgoat-lessons/cia/pom.xml
index 8362fb105..94fe3f9e4 100644
--- a/webgoat-lessons/cia/pom.xml
+++ b/webgoat-lessons/cia/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/client-side-filtering/pom.xml b/webgoat-lessons/client-side-filtering/pom.xml
index e92517422..fe0f35b49 100644
--- a/webgoat-lessons/client-side-filtering/pom.xml
+++ b/webgoat-lessons/client-side-filtering/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/cross-site-scripting/pom.xml b/webgoat-lessons/cross-site-scripting/pom.xml
index 43f197648..1b72ff455 100644
--- a/webgoat-lessons/cross-site-scripting/pom.xml
+++ b/webgoat-lessons/cross-site-scripting/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/crypto/pom.xml b/webgoat-lessons/crypto/pom.xml
index 0b5b99d70..3a5c50e96 100644
--- a/webgoat-lessons/crypto/pom.xml
+++ b/webgoat-lessons/crypto/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/csrf/pom.xml b/webgoat-lessons/csrf/pom.xml
index 940662434..dd0d0566d 100644
--- a/webgoat-lessons/csrf/pom.xml
+++ b/webgoat-lessons/csrf/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/html-tampering/pom.xml b/webgoat-lessons/html-tampering/pom.xml
index 3c4d91f27..e376c3550 100755
--- a/webgoat-lessons/html-tampering/pom.xml
+++ b/webgoat-lessons/html-tampering/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/http-basics/pom.xml b/webgoat-lessons/http-basics/pom.xml
index 8af8630ab..12548a587 100644
--- a/webgoat-lessons/http-basics/pom.xml
+++ b/webgoat-lessons/http-basics/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/http-proxies/pom.xml b/webgoat-lessons/http-proxies/pom.xml
index 35b25961d..1b0a2ef54 100644
--- a/webgoat-lessons/http-proxies/pom.xml
+++ b/webgoat-lessons/http-proxies/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/idor/pom.xml b/webgoat-lessons/idor/pom.xml
index 3e9feb2fe..6cf15bad7 100644
--- a/webgoat-lessons/idor/pom.xml
+++ b/webgoat-lessons/idor/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/insecure-deserialization/pom.xml b/webgoat-lessons/insecure-deserialization/pom.xml
index 1d7a503aa..9e462d155 100755
--- a/webgoat-lessons/insecure-deserialization/pom.xml
+++ b/webgoat-lessons/insecure-deserialization/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/insecure-login/pom.xml b/webgoat-lessons/insecure-login/pom.xml
index e66265c74..6efd8b3b9 100755
--- a/webgoat-lessons/insecure-login/pom.xml
+++ b/webgoat-lessons/insecure-login/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/jwt/pom.xml b/webgoat-lessons/jwt/pom.xml
index 45421bc6d..b86dff4d7 100644
--- a/webgoat-lessons/jwt/pom.xml
+++ b/webgoat-lessons/jwt/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/missing-function-ac/pom.xml b/webgoat-lessons/missing-function-ac/pom.xml
index 2d6a3129e..c56190289 100644
--- a/webgoat-lessons/missing-function-ac/pom.xml
+++ b/webgoat-lessons/missing-function-ac/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/password-reset/pom.xml b/webgoat-lessons/password-reset/pom.xml
index 9210fae2d..574c22f32 100644
--- a/webgoat-lessons/password-reset/pom.xml
+++ b/webgoat-lessons/password-reset/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/path-traversal/pom.xml b/webgoat-lessons/path-traversal/pom.xml
index d84453dca..a86048b84 100644
--- a/webgoat-lessons/path-traversal/pom.xml
+++ b/webgoat-lessons/path-traversal/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/pom.xml b/webgoat-lessons/pom.xml
index 8c107a3db..1974f8be4 100644
--- a/webgoat-lessons/pom.xml
+++ b/webgoat-lessons/pom.xml
@@ -5,12 +5,12 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
pom
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/secure-passwords/pom.xml b/webgoat-lessons/secure-passwords/pom.xml
index 224f4e86c..950cb26c3 100644
--- a/webgoat-lessons/secure-passwords/pom.xml
+++ b/webgoat-lessons/secure-passwords/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/sql-injection/pom.xml b/webgoat-lessons/sql-injection/pom.xml
index 0ac51bb8b..b1e63bdb4 100644
--- a/webgoat-lessons/sql-injection/pom.xml
+++ b/webgoat-lessons/sql-injection/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/ssrf/pom.xml b/webgoat-lessons/ssrf/pom.xml
index 329260f4c..13b3e1e4b 100755
--- a/webgoat-lessons/ssrf/pom.xml
+++ b/webgoat-lessons/ssrf/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/vulnerable-components/pom.xml b/webgoat-lessons/vulnerable-components/pom.xml
index e53d3c15c..97ded9f15 100644
--- a/webgoat-lessons/vulnerable-components/pom.xml
+++ b/webgoat-lessons/vulnerable-components/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/webgoat-introduction/pom.xml b/webgoat-lessons/webgoat-introduction/pom.xml
index 164776c01..5372e2798 100644
--- a/webgoat-lessons/webgoat-introduction/pom.xml
+++ b/webgoat-lessons/webgoat-introduction/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup b/webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup
deleted file mode 100644
index f196aca19..000000000
--- a/webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup
+++ /dev/null
@@ -1,11 +0,0 @@
-
- 4.0.0
- webwolf-introduction
- jar
-
- org.owasp.webgoat.lesson
- webgoat-lessons-parent
- 8.0-SNAPSHOT
-
-
\ No newline at end of file
diff --git a/webgoat-lessons/webgoat-lesson-template/pom.xml b/webgoat-lessons/webgoat-lesson-template/pom.xml
index 98282bd37..cc275b76f 100644
--- a/webgoat-lessons/webgoat-lesson-template/pom.xml
+++ b/webgoat-lessons/webgoat-lesson-template/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-lessons/webwolf-introduction/pom.xml b/webgoat-lessons/webwolf-introduction/pom.xml
index 7a4d58616..ab185a506 100644
--- a/webgoat-lessons/webwolf-introduction/pom.xml
+++ b/webgoat-lessons/webwolf-introduction/pom.xml
@@ -6,6 +6,6 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/webgoat-lessons/xxe/pom.xml b/webgoat-lessons/xxe/pom.xml
index e99f122d0..263fef6cd 100644
--- a/webgoat-lessons/xxe/pom.xml
+++ b/webgoat-lessons/xxe/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat.lesson
webgoat-lessons-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webgoat-server/pom.xml b/webgoat-server/pom.xml
index dce260880..e3bce069f 100644
--- a/webgoat-server/pom.xml
+++ b/webgoat-server/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT
diff --git a/webwolf/pom.xml b/webwolf/pom.xml
index 0123d7f12..fa45cb3e8 100644
--- a/webwolf/pom.xml
+++ b/webwolf/pom.xml
@@ -6,7 +6,7 @@
org.owasp.webgoat
webgoat-parent
- 8.2.1-SNAPSHOT
+ 8.2.0-SNAPSHOT