From cf983755b20dc3b08da90acc720d4853073c1bd6 Mon Sep 17 00:00:00 2001
From: konsoletyper <konsoletyper@gmail.com>
Date: Sun, 8 Mar 2015 12:31:21 +0300
Subject: [PATCH] Switch to DukeScript 1.1. Minor formatting fixes

---
 pom.xml                                       |   2 +-
 teavm-samples/teavm-samples-benchmark/pom.xml | 189 +++++++++---------
 2 files changed, 90 insertions(+), 101 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6937d906f..abe9225e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
-    <html4j.version>1.0</html4j.version>
+    <html4j.version>1.1</html4j.version>
     <jetty.version>9.2.1.v20140609</jetty.version>
     <slf4j.version>1.7.7</slf4j.version>
   </properties>
diff --git a/teavm-samples/teavm-samples-benchmark/pom.xml b/teavm-samples/teavm-samples-benchmark/pom.xml
index a0851d244..00c095804 100644
--- a/teavm-samples/teavm-samples-benchmark/pom.xml
+++ b/teavm-samples/teavm-samples-benchmark/pom.xml
@@ -1,20 +1,10 @@
-<!--
-    Copyright 2014 Alexey Andreev.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
+<!-- Copyright 2014 Alexey Andreev. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this 
+  file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. -->
 <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/xsd/maven-4.0.0.xsd">
+  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>
 
   <parent>
@@ -73,7 +63,6 @@
     <dependency>
       <groupId>org.netbeans.html</groupId>
       <artifactId>net.java.html.boot</artifactId>
-      <version>1.1</version>
     </dependency>
   </dependencies>
 
@@ -94,66 +83,66 @@
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.5</version>
         <executions>
-            <execution>
-                <phase>prepare-package</phase>
-                <goals>
-                    <goal>jar</goal>
-                </goals>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.teamvm.samples.benchmark.htmljava.BenchmarkStarter</mainClass>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <useUniqueVersions>false</useUniqueVersions>
-                        </manifest>
-                    </archive>
-                    <excludes>
-                        <exclude>**/gwt/*</exclude>
-                        <exclude>**/teavm/*</exclude>
-                    </excludes>
-                </configuration>
-            </execution>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <archive>
+                <manifest>
+                  <mainClass>org.teamvm.samples.benchmark.htmljava.BenchmarkStarter</mainClass>
+                  <addClasspath>true</addClasspath>
+                  <classpathPrefix>lib/</classpathPrefix>
+                  <useUniqueVersions>false</useUniqueVersions>
+                </manifest>
+              </archive>
+              <excludes>
+                <exclude>**/gwt/*</exclude>
+                <exclude>**/teavm/*</exclude>
+              </excludes>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
-          <groupId>org.teavm</groupId>
-          <artifactId>teavm-maven-plugin</artifactId>
-          <version>${project.version}</version>
-          <executions>
-              <execution>
-                  <id>web-client</id>
-                  <phase>prepare-package</phase>
-                  <goals>
-                      <goal>build-javascript</goal>
-                  </goals>
-                  <configuration>
-                      <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
-                      <mainClass>org.teavm.samples.benchmark.teavm.BenchmarkStarter</mainClass>
-                      <runtime>SEPARATE</runtime>
-                      <minifying>false</minifying>
-                      <debugInformationGenerated>true</debugInformationGenerated>
-                  </configuration>
-              </execution>
-          </executions>
+        <groupId>org.teavm</groupId>
+        <artifactId>teavm-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <id>web-client</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>build-javascript</goal>
+            </goals>
+            <configuration>
+              <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
+              <mainClass>org.teavm.samples.benchmark.teavm.BenchmarkStarter</mainClass>
+              <runtime>SEPARATE</runtime>
+              <minifying>true</minifying>
+              <debugInformationGenerated>true</debugInformationGenerated>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>gwt-maven-plugin</artifactId>
-          <version>2.7.0</version>
-          <executions>
-              <execution>
-                  <goals>
-                      <goal>compile</goal>
-                  </goals>
-                  <configuration>
-                      <optimizationLevel>9</optimizationLevel>
-                      <compileSourcesArtifacts>
-                          <item>org.jbox2d:jbox2d-library</item>
-                      </compileSourcesArtifacts>
-                  </configuration>
-              </execution>
-          </executions>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>gwt-maven-plugin</artifactId>
+        <version>2.7.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <optimizationLevel>9</optimizationLevel>
+              <compileSourcesArtifacts>
+                <item>org.jbox2d:jbox2d-library</item>
+              </compileSourcesArtifacts>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -172,11 +161,11 @@
         <artifactId>html4j-maven-plugin</artifactId>
         <version>1.1</version>
         <executions>
-            <execution>
-                <goals>
-                    <goal>process-js-annotations</goal>
-                </goals>
-            </execution>
+          <execution>
+            <goals>
+              <goal>process-js-annotations</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -186,28 +175,28 @@
     </plugins>
   </build>
   <profiles>
-      <profile>
-          <id>fx</id>
-          <dependencies>
-              <dependency>
-                  <groupId>org.netbeans.html</groupId>
-                  <artifactId>net.java.html.boot.fx</artifactId>
-                  <version>1.1</version>
-                  <scope>runtime</scope>
-              </dependency>
-          </dependencies>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>exec-maven-plugin</artifactId>
-                      <version>1.3.2</version>
-                      <configuration>
-                          <mainClass>org.teavm.samples.benchmark.htmljava.BenchmarkFX</mainClass>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
+    <profile>
+      <id>fx</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.netbeans.html</groupId>
+          <artifactId>net.java.html.boot.fx</artifactId>
+          <version>1.1</version>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.3.2</version>
+            <configuration>
+              <mainClass>org.teavm.samples.benchmark.htmljava.BenchmarkFX</mainClass>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
\ No newline at end of file