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 2017/01/26 03:03:19 UTC
svn commit: r1780318 - in /velocity/engine/trunk: pom.xml
velocity-engine-core/pom.xml
Author: cbrisson
Date: Thu Jan 26 03:03:18 2017
New Revision: 1780318
URL: http://svn.apache.org/viewvc?rev=1780318&view=rev
Log:
[engine] factorize source and target jdk versions across pom files
Modified:
velocity/engine/trunk/pom.xml
velocity/engine/trunk/velocity-engine-core/pom.xml
Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1780318&r1=1780317&r2=1780318&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Thu Jan 26 03:03:18 2017
@@ -45,6 +45,8 @@
<slf4j.version>1.7.21</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.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<!-- java 8 doclint checks are too strict for our current javadoc state... -->
@@ -85,8 +87,8 @@
<optimize>false</optimize>
<showDeprecation>true</showDeprecation>
<showWarning>true</showWarning>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1780318&r1=1780317&r2=1780318&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Thu Jan 26 03:03:18 2017
@@ -112,14 +112,10 @@
<debugParser>false</debugParser>
<debugLookAhead>false</debugLookAhead>
<debugTokenManager>false</debugTokenManager>
- <jdkVersion>1.7</jdkVersion>
+ <jdkVersion>${maven.compiler.target}</jdkVersion>
<nodeUsesParser>true</nodeUsesParser>
<nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>
<sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
-<!--
- <interimDirectory>${basedir}/src/main/java</interimDirectory>
- <outputDirectory>${basedir}/src/main/java</outputDirectory>
--->
</configuration>
</plugin>
</plugins>