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

Replace ${revision} with real version as Maven

Browse Source 
The CI pipeline should take care of this.
This commit is contained in:
Nanne Baars 2021-03-30 08:04:14 +02:00 committed by Nanne Baars
parent b8bdb8f432
commit ae6d448aa0
37 changed files with 131 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
.github/workflows/release.yml vendored
View File

@ -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

1
.gitignore vendored
View File

@ -54,3 +54,4 @@ webgoat.properties
webgoat.script
TestClass.class
**/*.flattened-pom.xml
/.gitconfig

2
docker/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

3
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<packaging>pom</packaging>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
<name>WebGoat Parent Pom</name>
<description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
@ -134,7 +134,6 @@
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<revision>8.2.0-SNAPSHOT</revision>
</properties>
<modules>

2
webgoat-container/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<build>

2
webgoat-integration-tests/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/auth-bypass/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/bypass-restrictions/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/challenge/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>

2
webgoat-lessons/chrome-dev-tools/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/cia/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/client-side-filtering/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/cross-site-scripting/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>

2
webgoat-lessons/crypto/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/csrf/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/html-tampering/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/http-basics/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/http-proxies/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/idor/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/insecure-deserialization/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/insecure-login/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/jwt/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/missing-function-ac/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/password-reset/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/path-traversal/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

4
webgoat-lessons/pom.xml
View File

@ -5,12 +5,12 @@
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<packaging>pom</packaging>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<modules>

2
webgoat-lessons/secure-passwords/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/sql-injection/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/ssrf/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-lessons/vulnerable-components/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>

2
webgoat-lessons/webgoat-introduction/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

11
webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup
View File

@ -1,11 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>webwolf-introduction</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/webgoat-lesson-template/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/webwolf-introduction/pom.xml
View File

@ -6,6 +6,6 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
</project>

2
webgoat-lessons/xxe/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat.lesson</groupId>
<artifactId>webgoat-lessons-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>

2
webgoat-server/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<properties>

2
webwolf/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<version>8.2.1-SNAPSHOT</version>
<version>8.2.0-SNAPSHOT</version>
</parent>
<dependencies>