From 9c0b7f8233c140f927f1325c03f508957b0e4af7 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sun, 17 Nov 2019 14:33:24 +0100
Subject: [PATCH] Fix version substitution so WebGot home directory contains
 version number instead of `@project.version@` in the name (#710)

---
 webgoat-container/pom.xml                     | 26 -------------------
 .../resources/application-webgoat.properties  |  1 -
 2 files changed, 27 deletions(-)

diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index 2ff24e942..c8f9e837d 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -14,33 +14,7 @@
     </parent>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/application.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <delimiters>
-                        <delimiter>@</delimiter>
-                    </delimiters>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/webgoat-container/src/main/resources/application-webgoat.properties b/webgoat-container/src/main/resources/application-webgoat.properties
index a06a39eea..f12438c83 100644
--- a/webgoat-container/src/main/resources/application-webgoat.properties
+++ b/webgoat-container/src/main/resources/application-webgoat.properties
@@ -32,7 +32,6 @@ webgoat.start.hsqldb=true
 webgoat.server.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.user.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.build.version=@project.version@
-webgoat.build.number=@build.number@
 webgoat.email=webgoat@owasp.org
 webgoat.emaillist=owasp-webgoat@lists.owasp.org
 webgoat.feedback.address=webgoat@owasp.org