WIP

The CI pipeline should take care of this.

.github/workflows/release.yml

@@ -4,15 +4,107 @@ on:
     tags:
       - v*
 jobs:
-  release:
+#  release:
-    name: Release WebGoat
+#    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 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
+        run: |
-      - name: "Get tag name"
+          git checkout develop
-        id: tag
-        uses: dawidd6/action-get-tag@v1
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
@@ -20,80 +112,12 @@ jobs:
           java-version: 11
           architecture: x64
 
-      - name: Cache Maven packages
+      - name: Set version to next snapshot
-        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
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
-          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
+      - name: Commit pom.xml
-          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
+        uses: actions/checkout@v2
-      - name: Build with Maven
         run: |
-          mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+          find . -name 'pom.xml' | xargs git add
-          mvn clean install -DskipTests
+          git commit -m "Updating to the new development version"
-
+          git push origin develop
-      - 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 }}

.gitignore

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

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>

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>

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>

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>

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>

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>

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>
 
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>