You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by sd...@apache.org on 2015/01/20 20:30:11 UTC

svn commit: r1653347 - in /velocity/engine/trunk: ./ velocity-engine-assembly/ velocity-engine-core/ velocity-engine-examples/ velocity-engine-log4j/ velocity-engine-servlet/ velocity-engine-slf4j/ velocity-engine-uberjar/

Author: sdumitriu
Date: Tue Jan 20 19:30:11 2015
New Revision: 1653347

URL: http://svn.apache.org/r1653347
Log:
[cleanup] Standardized indentation in pom files

Modified:
    velocity/engine/trunk/pom.xml
    velocity/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/engine/trunk/velocity-engine-core/pom.xml
    velocity/engine/trunk/velocity-engine-examples/pom.xml
    velocity/engine/trunk/velocity-engine-log4j/pom.xml
    velocity/engine/trunk/velocity-engine-servlet/pom.xml
    velocity/engine/trunk/velocity-engine-slf4j/pom.xml
    velocity/engine/trunk/velocity-engine-uberjar/pom.xml

Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Tue Jan 20 19:30:11 2015
@@ -1,297 +1,297 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-    <!--
-        Licensed to the Apache Software Foundation (ASF) under one or
-        more contributor license agreements. See the NOTICE file
-        distributed with this work for additional information regarding
-        copyright ownership. The ASF licenses this file to you 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.
-    -->
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you 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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-master</artifactId>
-        <version>2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>velocity-engine-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-
-    <name>Apache Velocity</name>
-    <url>http://velocity.apache.org/engine/devel/</url>
-    <description>Apache Velocity is a general purpose template engine.</description>
-    <inceptionYear>2000</inceptionYear>
-    <packaging>pom</packaging>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0</version>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <goals>deploy site-deploy</goals>
-                        <arguments>-Papache-release</arguments>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <inputEncoding>UTF-8</inputEncoding>
-                    <outputEncoding>UTF-8</outputEncoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <site>
-            <id>velocity.apache.org</id>
-            <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/
-            </url>
-        </site>
-    </distributionManagement>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin
-                </artifactId>
-                <version>2.7</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changes-plugin</artifactId>
-                <version>2.9</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>changes-report</report>
-                            <!-- <report>jira-report</report> -->
-                        </reports>
-                    </reportSet>
-                </reportSets>
-                <configuration>
-                    <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
-                    <!-- Apache JIRA, Component Engine -->
-                    <component>12311337</component>
-                    <!-- FixFor 1.6 -->
-                    <filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
-                    <maxEntries>100</maxEntries>
-                    <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <tag>TODO</tag>
-                    <tag>FIXME</tag>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <configuration>
-                    <excludePackageNames>org.apache.velocity.example</excludePackageNames>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://jakarta.apache.org/oro/api</link>
-                        <link>http://commons.apache.org/lang/api-release/</link>
-                        <link>http://commons.apache.org/collections/api-release/</link>
-                        <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
-                        <link>http://excalibur.apache.org/apidocs</link>
-                        <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/</link>
-                    </links>
-                </configuration>
-                <reportSets>
-                    <reportSet>
-                        <id>non-aggregate</id>
-                        <reports>
-                            <report>javadoc</report>
-                        </reports>
-                    </reportSet>
-                    <reportSet>
-                        <id>aggregated</id>
-                        <reports>
-                            <report>aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changelog-plugin</artifactId>
-                <version>2.2</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
-        <tag>HEAD</tag>
-        <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
-    </scm>
-
-    <properties>
-        <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
-    </properties>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>${jira.browse.url}/VELOCITY</url>
-    </issueManagement>
-    <modules>
-        <module>velocity-engine-core</module>
-        <module>velocity-engine-log4j</module>
-        <module>velocity-engine-commons-logging</module>
-        <module>velocity-engine-servlet</module>
-        <module>velocity-engine-slf4j</module>
-        <module>velocity-engine-examples</module>
-        <module>velocity-engine-uberjar</module>
-        <module>velocity-engine-assembly</module>
-    </modules>
-
-    <!-- This project is an effort by many people. If you feel that your name
-         should be in here and has been omitted in error, please open an issue
-         with the Apache Velocity Issue tracker. -->
-    <contributors>
-        <contributor>
-            <name>Adrian Tarau</name>
-        </contributor>
-        <contributor>
-            <name>Aki Nieminen</name>
-        </contributor>
-        <contributor>
-            <name>Alexey Pachenko</name>
-        </contributor>
-        <contributor>
-            <name>Anil K. Vijendran</name>
-        </contributor>
-        <contributor>
-            <name>Attila Szegedi</name>
-        </contributor>
-        <contributor>
-            <name>Bob McWhirter</name>
-        </contributor>
-        <contributor>
-            <name>Byron Foster</name>
-        </contributor>
-        <contributor>
-            <name>Christoph Reck</name>
-        </contributor>
-        <contributor>
-            <name>Dave Bryson</name>
-        </contributor>
-        <contributor>
-            <name>David Kinnvall</name>
-        </contributor>
-        <contributor>
-            <name>Eelco Hillenius</name>
-        </contributor>
-        <contributor>
-            <name>Fedor Karpelevitch</name>
-        </contributor>
-        <contributor>
-            <name>Gal Shachor</name>
-        </contributor>
-        <contributor>
-            <name>Hervé Boutemy</name>
-        </contributor>
-        <contributor>
-            <name>Jarkko Viinamäki</name>
-        </contributor>
-        <contributor>
-            <name>Jeff Bowden</name>
-        </contributor>
-        <contributor>
-            <name>Jose Alberto Fernandez</name>
-        </contributor>
-        <contributor>
-            <name>Kasper Nielsen</name>
-        </contributor>
-        <contributor>
-            <name>Kent Johnson</name>
-        </contributor>
-        <contributor>
-            <name>Kyle F. Downey</name>
-        </contributor>
-        <contributor>
-            <name>Leon Messerschmidt</name>
-        </contributor>
-        <contributor>
-            <name>Llewellyn Falco</name>
-        </contributor>
-        <contributor>
-            <name>Matt Raible</name>
-        </contributor>
-        <contributor>
-            <name>Matthijs Lambooy</name>
-        </contributor>
-        <contributor>
-            <name>Paulo Gaspar</name>
-        </contributor>
-        <contributor>
-            <name>Peter Romianowski</name>
-        </contributor>
-        <contributor>
-            <name>Robert Burrell Donkin</name>
-        </contributor>
-        <contributor>
-            <name>Sam Ruby</name>
-        </contributor>
-        <contributor>
-            <name>Sean Legassick</name>
-        </contributor>
-        <contributor>
-            <name>Serge Knystautas</name>
-        </contributor>
-        <contributor>
-            <name>Stephane Bailliez</name>
-        </contributor>
-        <contributor>
-            <name>Stephen Habermann</name>
-        </contributor>
-        <contributor>
-            <name>Sylwester Lachiewicz</name>
-        </contributor>
-    </contributors>
+  <parent>
+    <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-master</artifactId>
+    <version>2-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>velocity-engine-parent</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+
+  <name>Apache Velocity</name>
+  <url>http://velocity.apache.org/engine/devel/</url>
+  <description>Apache Velocity is a general purpose template engine.</description>
+  <inceptionYear>2000</inceptionYear>
+  <packaging>pom</packaging>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0</version>
+          <configuration>
+            <useReleaseProfile>false</useReleaseProfile>
+            <goals>deploy site-deploy</goals>
+            <arguments>-Papache-release</arguments>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <distributionManagement>
+    <site>
+      <id>velocity.apache.org</id>
+      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/
+      </url>
+    </site>
+  </distributionManagement>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin
+        </artifactId>
+        <version>2.7</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>2.9</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+              <!-- <report>jira-report</report> -->
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+          <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
+          <!-- Apache JIRA, Component Engine -->
+          <component>12311337</component>
+          <!-- FixFor 1.6 -->
+          <filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
+          <maxEntries>100</maxEntries>
+          <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <tag>TODO</tag>
+          <tag>FIXME</tag>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <configuration>
+          <excludePackageNames>org.apache.velocity.example</excludePackageNames>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+            <link>http://jakarta.apache.org/oro/api</link>
+            <link>http://commons.apache.org/lang/api-release/</link>
+            <link>http://commons.apache.org/collections/api-release/</link>
+            <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
+            <link>http://excalibur.apache.org/apidocs</link>
+            <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/</link>
+          </links>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <id>non-aggregate</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+          <reportSet>
+            <id>aggregated</id>
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changelog-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
+    <tag>HEAD</tag>
+    <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
+  </scm>
+
+  <properties>
+    <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
+  </properties>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>${jira.browse.url}/VELOCITY</url>
+  </issueManagement>
+  <modules>
+    <module>velocity-engine-core</module>
+    <module>velocity-engine-log4j</module>
+    <module>velocity-engine-commons-logging</module>
+    <module>velocity-engine-servlet</module>
+    <module>velocity-engine-slf4j</module>
+    <module>velocity-engine-examples</module>
+    <module>velocity-engine-uberjar</module>
+    <module>velocity-engine-assembly</module>
+  </modules>
+
+  <!-- This project is an effort by many people. If you feel that your name
+     should be in here and has been omitted in error, please open an issue
+     with the Apache Velocity Issue tracker. -->
+  <contributors>
+    <contributor>
+      <name>Adrian Tarau</name>
+    </contributor>
+    <contributor>
+      <name>Aki Nieminen</name>
+    </contributor>
+    <contributor>
+      <name>Alexey Pachenko</name>
+    </contributor>
+    <contributor>
+      <name>Anil K. Vijendran</name>
+    </contributor>
+    <contributor>
+      <name>Attila Szegedi</name>
+    </contributor>
+    <contributor>
+      <name>Bob McWhirter</name>
+    </contributor>
+    <contributor>
+      <name>Byron Foster</name>
+    </contributor>
+    <contributor>
+      <name>Christoph Reck</name>
+    </contributor>
+    <contributor>
+      <name>Dave Bryson</name>
+    </contributor>
+    <contributor>
+      <name>David Kinnvall</name>
+    </contributor>
+    <contributor>
+      <name>Eelco Hillenius</name>
+    </contributor>
+    <contributor>
+      <name>Fedor Karpelevitch</name>
+    </contributor>
+    <contributor>
+      <name>Gal Shachor</name>
+    </contributor>
+    <contributor>
+      <name>Hervé Boutemy</name>
+    </contributor>
+    <contributor>
+      <name>Jarkko Viinamäki</name>
+    </contributor>
+    <contributor>
+      <name>Jeff Bowden</name>
+    </contributor>
+    <contributor>
+      <name>Jose Alberto Fernandez</name>
+    </contributor>
+    <contributor>
+      <name>Kasper Nielsen</name>
+    </contributor>
+    <contributor>
+      <name>Kent Johnson</name>
+    </contributor>
+    <contributor>
+      <name>Kyle F. Downey</name>
+    </contributor>
+    <contributor>
+      <name>Leon Messerschmidt</name>
+    </contributor>
+    <contributor>
+      <name>Llewellyn Falco</name>
+    </contributor>
+    <contributor>
+      <name>Matt Raible</name>
+    </contributor>
+    <contributor>
+      <name>Matthijs Lambooy</name>
+    </contributor>
+    <contributor>
+      <name>Paulo Gaspar</name>
+    </contributor>
+    <contributor>
+      <name>Peter Romianowski</name>
+    </contributor>
+    <contributor>
+      <name>Robert Burrell Donkin</name>
+    </contributor>
+    <contributor>
+      <name>Sam Ruby</name>
+    </contributor>
+    <contributor>
+      <name>Sean Legassick</name>
+    </contributor>
+    <contributor>
+      <name>Serge Knystautas</name>
+    </contributor>
+    <contributor>
+      <name>Stephane Bailliez</name>
+    </contributor>
+    <contributor>
+      <name>Stephen Habermann</name>
+    </contributor>
+    <contributor>
+      <name>Sylwester Lachiewicz</name>
+    </contributor>
+  </contributors>
 </project>

Modified: velocity/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Tue Jan 20 19:30:11 2015
@@ -1,5 +1,4 @@
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.velocity</groupId>

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Tue Jan 20 19:30:11 2015
@@ -1,241 +1,242 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-engine-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>velocity-engine-core</artifactId>
-    <name>Apache Velocity - Engine</name>
-
-	<properties>
-	   <!-- command line switch -Dparser.create=true generates the parser files -->
-	   <parser.create>false</parser.create>
-	   
-	   <!-- command line switch -Dparser.nodefiles=true generates AST Node classes (new structures added to parser) --> 
-	   <parser.nodefiles>false</parser.nodefiles>
-	</properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
-                <configuration>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                    <delimiters>
-                        <delimiter>${*}</delimiter>
-                    </delimiters>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <id>shade</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.commons.collections</pattern>
-                                    <shadedPattern>org.apache.velocity.shaded.commons.collections</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.lang</pattern>
-                                    <shadedPattern>org.apache.velocity.shaded.commons.lang</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <minimizeJar>true</minimizeJar>
-                            <filters>
-                                <filter>
-                                    <artifact>commons-lang:commons-lang</artifact>
-                                    <includes>
-                                        <include>org/apache/commons/lang/Entities*.class</include>
-                                        <include>org/apache/commons/lang/IntHashMap*.class</include>
-                                        <include>org/apache/commons/lang/StringEscapeUtils.class</include>
-                                        <include>org/apache/commons/lang/StringUtils.class</include>
-                                        <include>org/apache/commons/lang/UnhandledException.class</include>
-                                        <include>org/apache/commons/lang/exception/Nestable.class</include>
-                                        <include>org/apache/commons/lang/exception/NestableRuntimeException.class</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>${maven.test.skip}</skip>
-                    <systemProperties>
-                        <property>
-                            <name>test</name>
-                            <value>${test}</value>
-                        </property>
-                        <property>
-                            <name>test.compare.dir</name>
-                            <value>${project.build.testOutputDirectory}</value>
-                        </property>
-                        <property>
-                            <name>test.result.dir</name>
-                            <value>${project.build.directory}/results</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-			<plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                  <execution>
-                     <id>jjtree-javacc</id>
-                     <goals>
-                        <goal>jjtree-javacc</goal>
-                     </goals>
-                  </execution>
-                </executions>
-                <configuration>
-                    <isStatic>false</isStatic>
-                    <buildParser>true</buildParser>
-                    <buildNodeFiles>${parser.nodefiles}</buildNodeFiles>
-                    <multi>true</multi>
-					<debugParser>false</debugParser>
-					<jdkVersion>1.4</jdkVersion>
-                    <nodeUsesParser>true</nodeUsesParser>
-                    <nodePackage>org.apache.velocity.runtime.parser</nodePackage>
-                    <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
-                    <interimDirectory>${basedir}/src/main/java</interimDirectory>
-                    <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                </configuration>
-           </plugin>
-		   <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                   <execution>
-				      <id>parser-init</id>
-                      <phase>initialize</phase>
-                         <configuration>
-                            <target if="${parser.create}">
-                               <delete quiet="true" verbose="false">
-                                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser" 
-								           includes="AST*.java,Parser*.java,Token*.java"/>
-                               </delete>
-                            </target>
-                         </configuration>
-                         <goals>
-                            <goal>run</goal>
-                         </goals>
-                   </execution>
-                   <execution>
-				      <id>parser-cleanup</id>
-                      <phase>process-sources</phase>
-                         <configuration>
-                            <target>
-							   <!-- delete unnecessary files generated by JavaCC -->
-                               <delete quiet="true" verbose="false">
-                                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser" 
-								           includes="Node.java,ParserVisitor.java,SimpleNode.java"/>
-                               </delete>
-							   <!-- fix JJTParserState class to use our custom Node class -->
-							   <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
-							      <replacetoken>import org.apache.velocity.runtime.parser.node.Node;</replacetoken>
-                                  <replacevalue></replacevalue>
-                               </replace>
-							   <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
-							      <replacetoken>package org.apache.velocity.runtime.parser;</replacetoken>
-                                  <replacevalue>package org.apache.velocity.runtime.parser; import org.apache.velocity.runtime.parser.node.Node;</replacevalue>
-                               </replace>
-							   <!-- if we just generated AST Node classes by JavaCC, end the build here and give instructions -->
-							   <condition property="stop"><istrue value="${parser.nodefiles}"/></condition>
-							   <fail if="stop"><![CDATA[-
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>velocity-engine-core</artifactId>
+  <name>Apache Velocity - Engine</name>
+
+  <properties>
+    <!-- command line switch -Dparser.create=true generates the parser files -->
+    <parser.create>false</parser.create>
+
+    <!-- command line switch -Dparser.nodefiles=true generates AST Node classes (new structures added to parser) -->
+    <parser.nodefiles>false</parser.nodefiles>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4.3</version>
+        <configuration>
+          <useDefaultDelimiters>false</useDefaultDelimiters>
+          <delimiters>
+            <delimiter>${*}</delimiter>
+          </delimiters>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.apache.commons.collections</pattern>
+                  <shadedPattern>org.apache.velocity.shaded.commons.collections</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.lang</pattern>
+                  <shadedPattern>org.apache.velocity.shaded.commons.lang</shadedPattern>
+                </relocation>
+              </relocations>
+              <minimizeJar>true</minimizeJar>
+              <filters>
+                <filter>
+                  <artifact>commons-lang:commons-lang</artifact>
+                  <includes>
+                    <include>org/apache/commons/lang/Entities*.class</include>
+                    <include>org/apache/commons/lang/IntHashMap*.class</include>
+                    <include>org/apache/commons/lang/StringEscapeUtils.class</include>
+                    <include>org/apache/commons/lang/StringUtils.class</include>
+                    <include>org/apache/commons/lang/UnhandledException.class</include>
+                    <include>org/apache/commons/lang/exception/Nestable.class</include>
+                    <include>org/apache/commons/lang/exception/NestableRuntimeException.class</include>
+                  </includes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>${maven.test.skip}</skip>
+          <systemProperties>
+            <property>
+              <name>test</name>
+              <value>${test}</value>
+            </property>
+            <property>
+              <name>test.compare.dir</name>
+              <value>${project.build.testOutputDirectory}</value>
+            </property>
+            <property>
+              <name>test.result.dir</name>
+              <value>${project.build.directory}/results</value>
+            </property>
+          </systemProperties>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javacc-maven-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>jjtree-javacc</id>
+            <goals>
+              <goal>jjtree-javacc</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <isStatic>false</isStatic>
+          <buildParser>true</buildParser>
+          <buildNodeFiles>${parser.nodefiles}</buildNodeFiles>
+          <multi>true</multi>
+          <debugParser>false</debugParser>
+          <jdkVersion>1.4</jdkVersion>
+          <nodeUsesParser>true</nodeUsesParser>
+          <nodePackage>org.apache.velocity.runtime.parser</nodePackage>
+          <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
+          <interimDirectory>${basedir}/src/main/java</interimDirectory>
+          <outputDirectory>${basedir}/src/main/java</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>parser-init</id>
+            <phase>initialize</phase>
+            <configuration>
+              <target if="${parser.create}">
+                <delete quiet="true" verbose="false">
+                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
+                    includes="AST*.java,Parser*.java,Token*.java"/>
+                </delete>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>parser-cleanup</id>
+            <phase>process-sources</phase>
+            <configuration>
+              <target>
+                <!-- delete unnecessary files generated by JavaCC -->
+                <delete quiet="true" verbose="false">
+                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
+                    includes="Node.java,ParserVisitor.java,SimpleNode.java"/>
+                </delete>
+                <!-- fix JJTParserState class to use our custom Node class -->
+                <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
+                  <replacetoken>import org.apache.velocity.runtime.parser.node.Node;</replacetoken>
+                  <replacevalue></replacevalue>
+                </replace>
+                <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
+                  <replacetoken>package org.apache.velocity.runtime.parser;</replacetoken>
+                  <replacevalue>package org.apache.velocity.runtime.parser; import org.apache.velocity.runtime.parser.node.Node;</replacevalue>
+                </replace>
+                 <!-- if we just generated AST Node classes by JavaCC, end the build here and give instructions -->
+                <condition property="stop"><istrue value="${parser.nodefiles}"/></condition>
+                <fail if="stop"><![CDATA[-
 -------------------------------------------------------------------------------
 Velocity AST Node classes created to src/main/java/org/apache/velocity/runtime/parser
 
-1. Delete already existing AST Node classes from this directory 
+1. Delete already existing AST Node classes from this directory
 2. Move the new generated AST Node class(es) to src/main/java/org/apache/velocity/runtime/parser/node
 3. Change the package name of the new AST Node(s) in the source code file
 4. Write the source code to support the new desired functionality of that node
 -------------------------------------------------------------------------------
 ]]>
 </fail>
-                            </target>
-                         </configuration>
-                         <goals>
-                            <goal>run</goal>
-                         </goals>
-                   </execution>
-                </executions>
-           </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.7.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <xmlOutput>true</xmlOutput>
-                    <threshold>Low</threshold>
-                    <effort>Max</effort>
-                    <excludeFilterFile>src/etc/build/findbugs-exclude.xml</excludeFilterFile>
-                    <xmlOutputDirectory>target/site</xmlOutputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <xmlOutput>true</xmlOutput>
+          <threshold>Low</threshold>
+          <effort>Max</effort>
+          <excludeFilterFile>src/etc/build/findbugs-exclude.xml</excludeFilterFile>
+          <xmlOutputDirectory>target/site</xmlOutputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

Modified: velocity/engine/trunk/velocity-engine-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-examples/pom.xml Tue Jan 20 19:30:11 2015
@@ -11,25 +11,25 @@
   <description>Very simple examples to use Velocity</description>
 
   <dependencies>
-  	<dependency>
-  		<groupId>org.apache.velocity</groupId>
-  		<artifactId>velocity-engine-core</artifactId>
-        <version>${project.version}</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>log4j</groupId>
-  		<artifactId>log4j</artifactId>
-  		<version>1.2.14</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.jdom</groupId>
-  		<artifactId>jdom</artifactId>
-  		<version>1.1</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.velocity</groupId>
-  		<artifactId>velocity-engine-log4j</artifactId>
-        <version>${project.version}</version>
-  	</dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-log4j</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: velocity/engine/trunk/velocity-engine-log4j/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-log4j/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-log4j/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-log4j/pom.xml Tue Jan 20 19:30:11 2015
@@ -11,15 +11,15 @@
   <description>LogChute implementation for Log4j.</description>
 
   <dependencies>
-  	<dependency>
-  		<groupId>org.apache.velocity</groupId>
-  		<artifactId>velocity-engine-core</artifactId>
-        <version>${project.version}</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>log4j</groupId>
-  		<artifactId>log4j</artifactId>
-  		<version>1.2.14</version>
-  	</dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: velocity/engine/trunk/velocity-engine-servlet/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-servlet/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-servlet/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-servlet/pom.xml Tue Jan 20 19:30:11 2015
@@ -18,9 +18,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-    	<groupId>org.apache.velocity</groupId>
-    	<artifactId>velocity-engine-core</artifactId>
-        <version>${project.version}</version>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: velocity/engine/trunk/velocity-engine-slf4j/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-slf4j/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-slf4j/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-slf4j/pom.xml Tue Jan 20 19:30:11 2015
@@ -1,65 +1,64 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-engine-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>velocity-engine-slf4j</artifactId>
-    <name>Apache Velocity Engine - SLF4J support</name>
-    <description>Support for SLF4J logging system.</description>
+  <artifactId>velocity-engine-slf4j</artifactId>
+  <name>Apache Velocity Engine - SLF4J support</name>
+  <description>Support for SLF4J logging system.</description>
 
-    <dependencies>
-    	<dependency>
-    		<groupId>org.slf4j</groupId>
-    		<artifactId>slf4j-api</artifactId>
-    		<version>1.6.1</version>
-    	</dependency>
-    	<dependency>
-    		<groupId>org.slf4j</groupId>
-    		<artifactId>slf4j-jdk14</artifactId>
-    		<version>1.6.1</version>
-            <optional>true</optional>
-    	</dependency>
-    	<dependency>
-    		<groupId>org.apache.velocity</groupId>
-    		<artifactId>velocity-engine-core</artifactId>
-            <version>${project.version}</version>
-    	</dependency>
-    	<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<version>4.8.2</version>
-    		<scope>test</scope>
-    	</dependency>
-    	<dependency>
-    		<groupId>org.powermock</groupId>
-    		<artifactId>powermock-module-junit4</artifactId>
-    		<version>1.4.6</version>
-    		<scope>test</scope>
-    	</dependency>
-    	<dependency>
-    		<groupId>org.powermock</groupId>
-    		<artifactId>powermock-api-easymock</artifactId>
-    		<version>1.4.6</version>
-    		<scope>test</scope>
-    	</dependency>
-    	<dependency>
-    		<groupId>cglib</groupId>
-    		<artifactId>cglib</artifactId>
-    		<version>2.2</version>
-    		<scope>test</scope>
-    	</dependency>
-    	<dependency>
-    		<groupId>org.easymock</groupId>
-    		<artifactId>easymock</artifactId>
-    		<version>3.0</version>
-    		<scope>test</scope>
-    	</dependency>
-    </dependencies>
-    <properties>
-    	<powermock.version>1.4.6</powermock.version>
-    </properties>
-</project>
\ No newline at end of file
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.6.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.4.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-easymock</artifactId>
+      <version>1.4.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <powermock.version>1.4.6</powermock.version>
+  </properties>
+</project>

Modified: velocity/engine/trunk/velocity-engine-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-uberjar/pom.xml?rev=1653347&r1=1653346&r2=1653347&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-uberjar/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-uberjar/pom.xml Tue Jan 20 19:30:11 2015
@@ -1,69 +1,68 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-engine-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>velocity-engine-uberjar</artifactId>
-    <name>Apache Velocity Engine - Uberjar package</name>
-    <description>Creates a JAR package containing all modules.</description>
+  <artifactId>velocity-engine-uberjar</artifactId>
+  <name>Apache Velocity Engine - Uberjar package</name>
+  <description>Creates a JAR package containing all modules.</description>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.3.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>org.apache.velocity:velocity-engine-core</include>
-                                    <include>org.apache.velocity:velocity-engine-commons-logging</include>
-                                    <include>org.apache.velocity:velocity-engine-slf4j</include>
-                                    <include>org.apache.velocity:velocity-engine-log4j</include>
-                                    <include>org.apache.velocity:velocity-engine-servlet</include>
-                                </includes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-commons-logging</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-log4j</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-slf4j</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-servlet</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.3.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.apache.velocity:velocity-engine-core</include>
+                  <include>org.apache.velocity:velocity-engine-commons-logging</include>
+                  <include>org.apache.velocity:velocity-engine-slf4j</include>
+                  <include>org.apache.velocity:velocity-engine-log4j</include>
+                  <include>org.apache.velocity:velocity-engine-servlet</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-commons-logging</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-log4j</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-slf4j</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-servlet</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>