Replace ${revision} with real version as Maven

The CI pipeline should take care of this.
This commit is contained in:
Nanne Baars
2021-03-30 08:04:14 +02:00
parent 1cd115ace5
commit efe4a87556
37 changed files with 60 additions and 47 deletions
.github/workflows
.gitignore
docker
pom.xml
webgoat-container
webgoat-integration-tests
webgoat-lessons
auth-bypass
bypass-restrictions
challenge
chrome-dev-tools
cia
client-side-filtering
cross-site-scripting
crypto
csrf
html-tampering
http-basics
http-proxies
idor
insecure-deserialization
insecure-login
jwt
missing-function-ac
password-reset
path-traversal
pom.xml
secure-passwords
sql-injection
ssrf
vulnerable-components
webgoat-introduction
webgoat-lesson-template
webwolf-introduction
xxe
webgoat-server
webwolf

@ -97,3 +97,27 @@ jobs:
- name: "Image digest"
run: echo ${{ steps.docker_build.outputs.digest }}
new_version:
name: Update development version
needs: [ release ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
run: |
git checkout develop
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
architecture: x64
- name: Set version to next snapshot
run: |
mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
- name: Commit pom.xml
uses: actions/checkout@v2
run: |
find . -name 'pom.xml' | xargs git add
git commit -m "Updating to the new development version"
git push origin develop

1
.gitignore vendored

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

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

@ -6,7 +6,7 @@
<groupId>org.owasp.webgoat</groupId>
<artifactId>webgoat-parent</artifactId>
<packaging>pom</packaging>
<version>${revision}</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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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