You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2013/07/05 22:02:12 UTC
svn commit: r1500113 - /mahout/trunk/pom.xml
Author: sslavic
Date: Fri Jul 5 20:02:11 2013
New Revision: 1500113
URL: http://svn.apache.org/r1500113
Log:
Replaced custom properties for compiler source and target JDK with Maven default ones; made source encoding references consistent too
Modified:
mahout/trunk/pom.xml
Modified: mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1500113&r1=1500112&r2=1500113&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Fri Jul 5 20:02:11 2013
@@ -95,8 +95,8 @@
</mailingLists>
<properties>
<skipTests>false</skipTests>
- <sourceJavaVersion>1.6</sourceJavaVersion>
- <targetJavaVersion>1.6</targetJavaVersion>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
<maven.clover.multiproject>true</maven.clover.multiproject>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>1.1.2</hadoop.version>
@@ -567,9 +567,10 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <encoding>UTF-8</encoding>
- <source>${sourceJavaVersion}</source>
- <target>${targetJavaVersion}</target>
+ <!-- encoding, source and target are explicitly defined until MNGECLIPSE-966 is fixed -->
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
<optimize>true</optimize>
</configuration>
</plugin>
@@ -584,9 +585,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
<executions>
<execution>
<id>validate</id>
@@ -620,8 +618,7 @@
<!-- classpath -->
<ruleset>../buildtools/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
- <sourceEncoding>UTF-8</sourceEncoding>
- <targetJdk>${targetJavaVersion}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
<linkXRef>false</linkXRef>
<includeTests>true</includeTests>
<verbose>true</verbose>
@@ -913,8 +910,7 @@
<rulesets>
<ruleset>../buildtools/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
- <sourceEncoding>UTF-8</sourceEncoding>
- <targetJdk>${targetJavaVersion}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
<linkXRef>false</linkXRef>
<includeTests>true</includeTests>
<verbose>true</verbose>