Repository: spark
Updated Branches:
  refs/heads/master 085a7216b -> e988adb58


[SPARK-8574] org/apache/spark/unsafe doesn't honor the java source/ta…

…rget versions.

I basically copied the compatibility rules from the top level pom.xml into 
here.  Someone more familiar with all the options in the top level pom may want 
to make sure nothing else should be copied on down.

With this is allows me to build with jdk8 and run with lower versions.  Source 
shows compiled for jdk6 as its supposed to.

Author: Tom Graves <[email protected]>
Author: Thomas Graves <[email protected]>

Closes #6989 from tgravescs/SPARK-8574 and squashes the following commits:

e1ea2d4 [Thomas Graves] Change to use combine.children="append"
150d645 [Tom Graves] [SPARK-8574] org/apache/spark/unsafe doesn't honor the 
java source/target versions


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e988adb5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e988adb5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e988adb5

Branch: refs/heads/master
Commit: e988adb58f02d06065837f3d79eee220f6558def
Parents: 085a721
Author: Tom Graves <[email protected]>
Authored: Thu Jun 25 08:27:08 2015 -0500
Committer: Tom Graves <[email protected]>
Committed: Thu Jun 25 08:27:08 2015 -0500

----------------------------------------------------------------------
 unsafe/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/e988adb5/unsafe/pom.xml
----------------------------------------------------------------------
diff --git a/unsafe/pom.xml b/unsafe/pom.xml
index 62c6354..dd2ae64 100644
--- a/unsafe/pom.xml
+++ b/unsafe/pom.xml
@@ -80,7 +80,7 @@
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
           <configuration>
-            <javacArgs>
+            <javacArgs combine.children="append">
               <!-- This option is needed to suppress warnings from 
sun.misc.Unsafe usage -->
               <javacArg>-XDignore.symbol.file</javacArg>
             </javacArgs>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to