You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2019/06/01 16:15:27 UTC

svn commit: r1860484 - in /velocity/engine/branches/parser_experiments: pom.xml velocity-engine-core/pom.xml velocity-engine-examples/pom.xml velocity-engine-scripting/pom.xml

Author: cbrisson
Date: Sat Jun  1 16:15:26 2019
New Revision: 1860484

URL: http://svn.apache.org/viewvc?rev=1860484&view=rev
Log:
[engine][VELOCITY-917] Fix pom.xml files indentation, reorder velocity-engine-plugin build plugins (no code change)

Modified:
    velocity/engine/branches/parser_experiments/pom.xml
    velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml
    velocity/engine/branches/parser_experiments/velocity-engine-examples/pom.xml
    velocity/engine/branches/parser_experiments/velocity-engine-scripting/pom.xml

Modified: velocity/engine/branches/parser_experiments/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/pom.xml?rev=1860484&r1=1860483&r2=1860484&view=diff
==============================================================================
--- velocity/engine/branches/parser_experiments/pom.xml (original)
+++ velocity/engine/branches/parser_experiments/pom.xml Sat Jun  1 16:15:26 2019
@@ -21,303 +21,303 @@
 -->
 <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>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.velocity</groupId>
-    <artifactId>velocity-master</artifactId>
-    <version>3</version>
-    <relativePath />
-  </parent>
+    <parent>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-master</artifactId>
+        <version>3</version>
+        <relativePath />
+    </parent>
 
-  <artifactId>velocity-engine-parent</artifactId>
-  <version>2.2-SNAPSHOT</version>
+    <artifactId>velocity-engine-parent</artifactId>
+    <version>2.2-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>
+    <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>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>4.12</junit.version>
-    <slf4j.version>1.7.26</slf4j.version>
-    <surefire.plugin.version>2.19.1</surefire.plugin.version>
-    <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>4.12</junit.version>
+        <slf4j.version>1.7.26</slf4j.version>
+        <surefire.plugin.version>2.19.1</surefire.plugin.version>
+        <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
-          <configuration>
-            <useReleaseProfile>false</useReleaseProfile>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <goals>deploy</goals>
-            <arguments>-Papache-release</arguments>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.1</version>
-          <configuration>
-            <archive>  
-              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-            </archive> 
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.5.0</version>
-          <executions>
-            <execution>
-              <id>bundle-manifest</id>
-              <phase>process-classes</phase>
-                <goals>    
-                  <goal>manifest</goal>
-                </goals>   
-              </execution>
-            </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <showDeprecation>true</showDeprecation>
-          <showWarning>true</showWarning>
-          <source>${maven.compiler.source}</source>
-          <target>${maven.compiler.target}</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-            <!-- full checking is left disabled
-            <doclint>html,missing,reference,syntax</doclint>
-            -->
-            <doclint>none</doclint>
-        </configuration>
-        <executions>
-            <execution>
-                <id>aggregate</id>
-                <goals>
-                    <goal>aggregate</goal>
-                </goals>
-            </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-bytecode-version</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <enforceBytecodeVersion>
-                  <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
-                </enforceBytecodeVersion>
-                <requireJavaVersion>
-                  <version>[1.8,)</version>
-                </requireJavaVersion>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-          <execution>
-            <id>ban-known-bad-maven-versions</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.0.5,)</version>
-                  <message>Maven minimal expected version is 3.0.5.</message>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-beta-9</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                    <configuration>
+                        <useReleaseProfile>false</useReleaseProfile>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <goals>deploy</goals>
+                        <arguments>-Papache-release</arguments>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.1.1</version>
+                    <configuration>
+                        <archive>  
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive> 
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>3.5.0</version>
+                    <executions>
+                        <execution>
+                            <id>bundle-manifest</id>
+                            <phase>process-classes</phase>
+                            <goals>    
+                                <goal>manifest</goal>
+                            </goals>   
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarning>true</showWarning>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <!-- full checking is left disabled
+                         <doclint>html,missing,reference,syntax</doclint>
+                    -->
+                    <doclint>none</doclint>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>aggregate</id>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-bytecode-version</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                                </enforceBytecodeVersion>
+                                <requireJavaVersion>
+                                    <version>[1.8,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>ban-known-bad-maven-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.0.5,)</version>
+                                    <message>Maven minimal expected version is 3.0.5.</message>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>extra-enforcer-rules</artifactId>
+                        <version>1.0-beta-9</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 
-  <distributionManagement>
-    <site>
-      <id>velocity.apache.org</id>
-      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/
-      </url>
-    </site>
-  </distributionManagement>
+    <distributionManagement>
+        <site>
+            <id>velocity.apache.org</id>
+            <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/
+            </url>
+        </site>
+    </distributionManagement>
 
-  <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>
-    <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
-  </scm>
+    <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>
+        <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
+    </scm>
 
-  <issueManagement>
-    <system>JIRA</system>
-    <url>${jira.browse.url}/VELOCITY</url>
-  </issueManagement>
-  <modules>
-    <module>velocity-engine-core</module>
-    <module>velocity-engine-examples</module>
-    <module>velocity-engine-scripting</module>
-  </modules>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>${jira.browse.url}/VELOCITY</url>
+    </issueManagement>
+    <modules>
+        <module>velocity-engine-core</module>
+        <module>velocity-engine-examples</module>
+        <module>velocity-engine-scripting</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>Candid Dauth</name>
-    </contributor>
-    <contributor>
-      <name>Christoph Reck</name>
-    </contributor>
-    <contributor>
-      <name>Darren Cruse</name>
-    </contributor>
-    <contributor>
-      <name>Dave Bryson</name>
-    </contributor>
-    <contributor>
-      <name>David Kinnvall</name>
-    </contributor>
-    <contributor>
-      <name>Dawid Weiss</name>
-    </contributor>
-    <contributor>
-      <name>Dishara Wijewardana</name>
-    </contributor>
-    <contributor>
-      <name>Eelco Hillenius</name>
-    </contributor>
-    <contributor>
-      <name>Fedor Karpelevitch</name>
-    </contributor>
-    <contributor>
-      <name>Felipe Maschio</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>Jorgen Rydenius</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>Matt Ryall</name>
-    </contributor>
-    <contributor>
-      <name>Matthijs Lambooy</name>
-    </contributor>
-    <contributor>
-      <name>Oswaldo Hernandez</name>
-    </contributor>
-    <contributor>
-      <name>Paulo Gaspar</name>
-    </contributor>
-    <contributor>
-      <name>Peter Romianowski</name>
-    </contributor>
-    <contributor>
-      <name>Robert Burrell Donkin</name>
-    </contributor>
-    <contributor>
-      <name>Robert Fuller</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>
+    <!-- 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>Candid Dauth</name>
+        </contributor>
+        <contributor>
+            <name>Christoph Reck</name>
+        </contributor>
+        <contributor>
+            <name>Darren Cruse</name>
+        </contributor>
+        <contributor>
+            <name>Dave Bryson</name>
+        </contributor>
+        <contributor>
+            <name>David Kinnvall</name>
+        </contributor>
+        <contributor>
+            <name>Dawid Weiss</name>
+        </contributor>
+        <contributor>
+            <name>Dishara Wijewardana</name>
+        </contributor>
+        <contributor>
+            <name>Eelco Hillenius</name>
+        </contributor>
+        <contributor>
+            <name>Fedor Karpelevitch</name>
+        </contributor>
+        <contributor>
+            <name>Felipe Maschio</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>Jorgen Rydenius</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>Matt Ryall</name>
+        </contributor>
+        <contributor>
+            <name>Matthijs Lambooy</name>
+        </contributor>
+        <contributor>
+            <name>Oswaldo Hernandez</name>
+        </contributor>
+        <contributor>
+            <name>Paulo Gaspar</name>
+        </contributor>
+        <contributor>
+            <name>Peter Romianowski</name>
+        </contributor>
+        <contributor>
+            <name>Robert Burrell Donkin</name>
+        </contributor>
+        <contributor>
+            <name>Robert Fuller</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/branches/parser_experiments/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml?rev=1860484&r1=1860483&r2=1860484&view=diff
==============================================================================
--- velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml (original)
+++ velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml Sat Jun  1 16:15:26 2019
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one
@@ -19,371 +20,372 @@
 
 -->
 <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.2-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>
-
-    <parser.debug>false</parser.debug>
-    
-    <!-- You can modify those properties locally to test
-         the DataSourceResourceLoader against other engines.
-         Please note that you may have to also alter the file
-         src/test/resources/ds/create-db.sql for specific engine SQL grammars.
-    -->
-    <test.jdbc.driver.groupId>org.hsqldb</test.jdbc.driver.groupId>
-    <test.jdbc.driver.artifactId>hsqldb</test.jdbc.driver.artifactId>
-    <test.jdbc.driver.version>2.3.5</test.jdbc.driver.version>
-    <test.jdbc.driver.className>org.hsqldb.jdbcDriver</test.jdbc.driver.className>
-    <test.jdbc.uri>jdbc:hsqldb:.</test.jdbc.uri>
-    <test.jdbc.login>sa</test.jdbc.login>
-    <test.jdbc.password />
-  </properties>
-
-  <build>
-    <plugins>
-      <!-- resources -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-          <useDefaultDelimiters>false</useDefaultDelimiters>
-          <delimiters>
-            <delimiter>${*}</delimiter>
-          </delimiters>
-        </configuration>
-      </plugin>
-
-      <!-- shading of commons-io -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
-        <executions>
-          <execution>
-            <id>shade</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>commons-io:commons-io</include>
-                </includes>
-                <excludes>
-                  <exclude>org.slf4j:slf4j-api</exclude>
-                </excludes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.apache.commons.io</pattern>
-                  <shadedPattern>org.apache.velocity.shaded.commons.io</shadedPattern>
-                </relocation>
-              </relocations>
-              <minimizeJar>true</minimizeJar>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.plugin.version}</version>
-        <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>
-            <property>
-              <name>org.slf4j.simpleLogger.defaultLogLevel</name>
-              <value>warn</value>
-            </property>
-            <property>
-                <name>org.slf4j.simpleLogger.logFile</name>
-                <value>${project.build.directory}/velocity.log</value>
-            </property>
-            <property>
-                <name>test.jdbc.driver.className</name>
-                <value>${test.jdbc.driver.className}</value>
-            </property>
-            <property>
-                <name>test.jdbc.uri</name>
-                <value>${test.jdbc.uri}</value>
-            </property>
-            <property>
-                <name>test.jdbc.login</name>
-                <value>${test.jdbc.login}</value>
-            </property>
-            <property>
-                <name>test.jdbc.password</name>
-                <value>${test.jdbc.password}</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>
-
-      <!-- parser -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <!-- build the standard parser -->
-          <execution>
-            <id>jjtree-javacc</id>
-            <goals>
-              <goal>jjtree-javacc</goal>
-            </goals>
-            <configuration>
-                <includes>
-                    <include>StandardParser.jjt</include>
-                </includes>
-            </configuration>
-          </execution>
-          <!-- build a tailored parser -->
-          <execution>
-            <id>jjtree-javacc-custom</id>
-            <goals>
-              <goal>jjtree-javacc</goal>
-            </goals>
-            <configuration>
-                <includes>
-                    <include>TailoredParser.jjt</include>
-                </includes>
-                <interimDirectory>${project.build.directory}/tailored-parser/jjtree</interimDirectory>
-                <outputDirectory>${project.build.directory}/tailored-parser/javacc</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <isStatic>false</isStatic>
-          <buildParser>true</buildParser>
-          <buildNodeFiles>${parser.nodefiles}</buildNodeFiles>
-          <multi>true</multi>
-          <debugParser>${parser.debug}</debugParser>
-          <debugLookAhead>${parser.debug}</debugLookAhead>
-          <debugTokenManager>${parser.debug}</debugTokenManager>
-          <jdkVersion>${maven.compiler.target}</jdkVersion>
-          <nodeUsesParser>true</nodeUsesParser>
-          <nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>
-          <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
-          <tokenManagerUsesParser>true</tokenManagerUsesParser>
-        </configuration>
-      </plugin>
-
-      <!--
-        patch generated parser and token managers files, so that
-        + both token managers implement the ParserTokenManager interface
-        + StandardParser uses the ParserTokenManager interface
-      -->
-      <plugin>
-          <groupId>com.google.code.maven-replacer-plugin</groupId>
-          <artifactId>replacer</artifactId>
-          <version>1.5.3</version>
-          <executions>
-              <execution>
-                  <id>patch-parser</id>
-                  <phase>process-sources</phase>
-                  <goals>
-                      <goal>replace</goal> 
-                  </goals>
-                  <configuration>
-                      <file>${project.build.directory}/generated-sources/javacc/org/apache/velocity/runtime/parser/StandardParser.java</file>
-                      <replacements>
-                          <replacement>
-                              <token>(?&lt;!new )StandardParserTokenManager</token>
-                              <value>ParserTokenManager</value>
-                          </replacement>
-                      </replacements>
-                  </configuration>
-              </execution>
-              <execution>
-                  <id>patch-token-manager</id>
-                  <phase>process-sources</phase>
-                  <goals>
-                      <goal>replace</goal> 
-                  </goals> 
-                  <configuration>
-                      <includes>
-                          <include>${project.build.directory}/generated-sources/javacc/org/apache/velocity/runtime/parser/StandardParserTokenManager.java</include>
-                          <include>${project.build.directory}/tailored-parser/javacc/org/apache/velocity/runtime/parser/TailoredParserTokenManager.java</include>
-                      </includes>
-                      <replacements>
-                          <replacement>
-                              <token>class StandardParserTokenManager implements StandardParserConstants(?!, ParserTokenManager)</token>
-                              <value>class StandardParserTokenManager implements StandardParserConstants, ParserTokenManager</value>
-                          </replacement> 
-                      </replacements>
-                  </configuration>
-              </execution>
-          </executions>
-      </plugin>
-
-      <!-- pre-compile both parser token manager classes -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile-patch-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <buildDirectory>${project.build.directory}/tailored-parser/classes</buildDirectory>
-              <includes>
-                <include>**/*TokenManager*.java/</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- handle OSGi informations -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.velocity.*
-            </Export-Package>
-            <Import-Package>
-              !org.apache.commons.io,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
-      <!-- remove duplicate javacc files -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <id>clean-extra-javacc</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <configuration>
-              <excludeDefaultDirectories>true</excludeDefaultDirectories>
-              <filesets>
-                <fileset>
-                  <directory>${project.build.directory}/tailored-parser/javacc</directory>
-                  <includes>
-                    <include>org/apache/velocity/runtime/parser/Token*.java</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- exclude tailored parser from final archive -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*TailoredParser*.class</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${test.jdbc.driver.groupId}</groupId>
-      <artifactId>${test.jdbc.driver.artifactId}</artifactId>
-      <version>${test.jdbc.driver.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.4</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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
+        <version>2.2-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>
+
+        <parser.debug>false</parser.debug>
+        
+        <!-- You can modify those properties locally to test
+             the DataSourceResourceLoader against other engines.
+             Please note that you may have to also alter the file
+             src/test/resources/ds/create-db.sql for specific engine SQL grammars.
+        -->
+        <test.jdbc.driver.groupId>org.hsqldb</test.jdbc.driver.groupId>
+        <test.jdbc.driver.artifactId>hsqldb</test.jdbc.driver.artifactId>
+        <test.jdbc.driver.version>2.3.5</test.jdbc.driver.version>
+        <test.jdbc.driver.className>org.hsqldb.jdbcDriver</test.jdbc.driver.className>
+        <test.jdbc.uri>jdbc:hsqldb:.</test.jdbc.uri>
+        <test.jdbc.login>sa</test.jdbc.login>
+        <test.jdbc.password />
+    </properties>
+
+    <build>
+        <plugins>
+            <!-- resources -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>${*}</delimiter>
+                    </delimiters>
+                </configuration>
+            </plugin>
+
+            <!-- shading of commons-io -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>shade</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>commons-io:commons-io</include>
+                                </includes>
+                                <excludes>
+                                    <exclude>org.slf4j:slf4j-api</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.commons.io</pattern>
+                                    <shadedPattern>org.apache.velocity.shaded.commons.io</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <minimizeJar>true</minimizeJar>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- parser -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javacc-maven-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <!-- build the standard parser -->
+                    <execution>
+                        <id>jjtree-javacc</id>
+                        <goals>
+                            <goal>jjtree-javacc</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>StandardParser.jjt</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                    <!-- build a tailored parser -->
+                    <execution>
+                        <id>jjtree-javacc-custom</id>
+                        <goals>
+                            <goal>jjtree-javacc</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>TailoredParser.jjt</include>
+                            </includes>
+                            <interimDirectory>${project.build.directory}/tailored-parser/jjtree</interimDirectory>
+                            <outputDirectory>${project.build.directory}/tailored-parser/javacc</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <isStatic>false</isStatic>
+                    <buildParser>true</buildParser>
+                    <buildNodeFiles>${parser.nodefiles}</buildNodeFiles>
+                    <multi>true</multi>
+                    <debugParser>${parser.debug}</debugParser>
+                    <debugLookAhead>${parser.debug}</debugLookAhead>
+                    <debugTokenManager>${parser.debug}</debugTokenManager>
+                    <jdkVersion>${maven.compiler.target}</jdkVersion>
+                    <nodeUsesParser>true</nodeUsesParser>
+                    <nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>
+                    <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
+                    <tokenManagerUsesParser>true</tokenManagerUsesParser>
+                </configuration>
+            </plugin>
+
+            <!--
+                patch generated parser and token managers files, so that
+                + both token managers implement the ParserTokenManager interface
+                + StandardParser uses the ParserTokenManager interface
+            -->
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <id>patch-parser</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>replace</goal> 
+                        </goals>
+                        <configuration>
+                            <file>${project.build.directory}/generated-sources/javacc/org/apache/velocity/runtime/parser/StandardParser.java</file>
+                            <replacements>
+                                <replacement>
+                                    <token>(?&lt;!new )StandardParserTokenManager</token>
+                                    <value>ParserTokenManager</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>patch-token-manager</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>replace</goal> 
+                        </goals> 
+                        <configuration>
+                            <includes>
+                                <include>${project.build.directory}/generated-sources/javacc/org/apache/velocity/runtime/parser/StandardParserTokenManager.java</include>
+                                <include>${project.build.directory}/tailored-parser/javacc/org/apache/velocity/runtime/parser/TailoredParserTokenManager.java</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>class StandardParserTokenManager implements StandardParserConstants(?!, ParserTokenManager)</token>
+                                    <value>class StandardParserTokenManager implements StandardParserConstants, ParserTokenManager</value>
+                                </replacement> 
+                            </replacements>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- pre-compile both parser token manager classes -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile-patch-sources</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <buildDirectory>${project.build.directory}/tailored-parser/classes</buildDirectory>
+                            <includes>
+                                <include>**/*TokenManager*.java/</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- remove duplicate javacc files -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>clean-extra-javacc</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <excludeDefaultDirectories>true</excludeDefaultDirectories>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.build.directory}/tailored-parser/javacc</directory>
+                                    <includes>
+                                        <include>org/apache/velocity/runtime/parser/Token*.java</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- handle OSGi informations -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.velocity.*
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.commons.io,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+            <!-- exclude tailored parser from final archive -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*TailoredParser*.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <!-- tests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.plugin.version}</version>
+                <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>
+                        <property>
+                            <name>org.slf4j.simpleLogger.defaultLogLevel</name>
+                            <value>warn</value>
+                        </property>
+                        <property>
+                            <name>org.slf4j.simpleLogger.logFile</name>
+                            <value>${project.build.directory}/velocity.log</value>
+                        </property>
+                        <property>
+                            <name>test.jdbc.driver.className</name>
+                            <value>${test.jdbc.driver.className}</value>
+                        </property>
+                        <property>
+                            <name>test.jdbc.uri</name>
+                            <value>${test.jdbc.uri}</value>
+                        </property>
+                        <property>
+                            <name>test.jdbc.login</name>
+                            <value>${test.jdbc.login}</value>
+                        </property>
+                        <property>
+                            <name>test.jdbc.password</name>
+                            <value>${test.jdbc.password}</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>
+
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${test.jdbc.driver.groupId}</groupId>
+            <artifactId>${test.jdbc.driver.artifactId}</artifactId>
+            <version>${test.jdbc.driver.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.4</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/branches/parser_experiments/velocity-engine-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-examples/pom.xml?rev=1860484&r1=1860483&r2=1860484&view=diff
==============================================================================
--- velocity/engine/branches/parser_experiments/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/branches/parser_experiments/velocity-engine-examples/pom.xml Sat Jun  1 16:15:26 2019
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one
@@ -19,36 +20,36 @@
 
 -->
 <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.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>velocity-engine-examples</artifactId>
-  <name>Apache Velocity Engine - Examples</name>
-  <description>Very simple examples to use Velocity</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>1.1</version>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>velocity-engine-examples</artifactId>
+    <name>Apache Velocity Engine - Examples</name>
+    <description>Very simple examples to use Velocity</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: velocity/engine/branches/parser_experiments/velocity-engine-scripting/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-scripting/pom.xml?rev=1860484&r1=1860483&r2=1860484&view=diff
==============================================================================
--- velocity/engine/branches/parser_experiments/velocity-engine-scripting/pom.xml (original)
+++ velocity/engine/branches/parser_experiments/velocity-engine-scripting/pom.xml Sat Jun  1 16:15:26 2019
@@ -20,64 +20,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.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>velocity-engine-scripting</artifactId>
-  <name>Apache Velocity - JSR 223 Scripting</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.plugin.version}</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>test.resources.dir</name>
-              <value>${project.build.directory}</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.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>velocity-engine-scripting</artifactId>
+    <name>Apache Velocity - JSR 223 Scripting</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.plugin.version}</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>test.resources.dir</name>
+                            <value>${project.build.directory}</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.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>