Replace ${revision} with real version as Maven

The CI pipeline should take care of this.
2021-03-30 08:04:14 +02:00 · 2021-03-30 08:04:14 +02:00 · efe4a87556
commit efe4a87556
parent 1cd115ace5
37 changed files with 60 additions and 47 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -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
--- a/.gitignore
+++ b/.gitignore
@ -54,3 +54,4 @@ webgoat.properties
 webgoat.script
 TestClass.class
 **/*.flattened-pom.xml
+/.gitconfig
--- a/docker/pom.xml
+++ b/docker/pom.xml
@ -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>
--- a/pom.xml
+++ b/pom.xml
@ -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>
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@ -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>
--- a/webgoat-integration-tests/pom.xml
+++ b/webgoat-integration-tests/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>


--- a/webgoat-lessons/chrome-dev-tools/pom.xml
+++ b/webgoat-lessons/chrome-dev-tools/pom.xml
@ -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>
--- a/webgoat-lessons/cia/pom.xml
+++ b/webgoat-lessons/cia/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>
    <dependencies>
        <dependency>
--- a/webgoat-lessons/crypto/pom.xml
+++ b/webgoat-lessons/crypto/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/webgoat-lessons/path-traversal/pom.xml
+++ b/webgoat-lessons/path-traversal/pom.xml
@ -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>
--- 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>${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>
--- a/webgoat-lessons/secure-passwords/pom.xml
+++ b/webgoat-lessons/secure-passwords/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>
 </project>
--- a/webgoat-lessons/ssrf/pom.xml
+++ b/webgoat-lessons/ssrf/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>
 </project>
--- a/webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup
+++ b/webgoat-lessons/webgoat-introduction/pom.xml.versionsBackup
@ -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>
--- a/webgoat-lessons/webgoat-lesson-template/pom.xml
+++ b/webgoat-lessons/webgoat-lesson-template/pom.xml
@ -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>
--- 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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</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>${revision}</version>
+        <version>8.2.0-SNAPSHOT</version>
    </parent>

    <dependencies>