From d5dd6089610906a722435139da92f1914e9d951a Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Wed, 15 Feb 2017 22:48:51 +0300
Subject: [PATCH] Fix ${project.version} in maven archetype. Add default value
 for optimizationLevel

---
 tools/maven/webapp/pom.xml                    | 25 +++++++++++++++++++
 .../resources/archetype-resources/pom.xml     | 25 +++++++++++--------
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/tools/maven/webapp/pom.xml b/tools/maven/webapp/pom.xml
index 4db1b64ca..404096841 100644
--- a/tools/maven/webapp/pom.xml
+++ b/tools/maven/webapp/pom.xml
@@ -29,7 +29,32 @@
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.5</version>
+          <configuration>
+            <escapeString>\</escapeString>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
+
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>archetype-resources/pom.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>archetype-resources/pom.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
   </build>
 </project>
\ No newline at end of file
diff --git a/tools/maven/webapp/src/main/resources/archetype-resources/pom.xml b/tools/maven/webapp/src/main/resources/archetype-resources/pom.xml
index f146ba319..f2bc95a2d 100644
--- a/tools/maven/webapp/src/main/resources/archetype-resources/pom.xml
+++ b/tools/maven/webapp/src/main/resources/archetype-resources/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
+  <groupId>\${groupId}</groupId>
+  <artifactId>\${artifactId}</artifactId>
+  <version>\${version}</version>
   <packaging>war</packaging>
 
   <properties>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.teavm</groupId>
       <artifactId>teavm-classlib</artifactId>
-      <version>${teavm.version}</version>
+      <version>\${teavm.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.teavm</groupId>
       <artifactId>teavm-jso-apis</artifactId>
-      <version>${teavm.version}</version>
+      <version>\${teavm.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -46,8 +46,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <source>\${java.version}</source>
+          <target>\${java.version}</target>
         </configuration>
       </plugin>
 
@@ -58,7 +58,7 @@
         <configuration>
           <webResources>
             <resource>
-              <directory>${project.build.directory}/generated/js</directory>
+              <directory>\${project.build.directory}/generated/js</directory>
             </resource>
           </webResources>
         </configuration>
@@ -68,7 +68,7 @@
       <plugin>
         <groupId>org.teavm</groupId>
         <artifactId>teavm-maven-plugin</artifactId>
-        <version>${teavm.version}</version>
+        <version>\${teavm.version}</version>
         <executions>
           <execution>
             <id>web-client</id>
@@ -78,10 +78,10 @@
             <configuration>
               <!-- Directory where TeaVM should put generated files. This configuration conforms to the settings
                    of the WAR plugin -->
-              <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
+              <targetDirectory>\${project.build.directory}/generated/js/teavm</targetDirectory>
 
               <!-- Main class, containing static void main(String[]) -->
-              <mainClass>${package}.Client</mainClass>
+              <mainClass>\${package}.Client</mainClass>
 
               <!-- Whether TeaVM should produce minified JavaScript. Can reduce JavaScript file size more than
                    two times -->
@@ -96,6 +96,9 @@
               <!-- Whether TeaVM should also put source files into output directory,
                    for compatibility with source maps -->
               <sourceFilesCopied>true</sourceFilesCopied>
+
+              <!-- Optimization level. Valid values are: SIMPLE, ADVANCED, FULL -->
+              <optimizationLevel>ADVANCED</optimizationLevel>
             </configuration>
           </execution>
         </executions>