Repository: spark Updated Branches: refs/heads/branch-1.4 74001db04 -> 13802163d
[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 <tgra...@yahoo-inc.com> Author: Thomas Graves <tgra...@staydecay.corp.gq1.yahoo.com> 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 (cherry picked from commit e988adb58f02d06065837f3d79eee220f6558def) Signed-off-by: Tom Graves <tgra...@yahoo-inc.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/13802163 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/13802163 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/13802163 Branch: refs/heads/branch-1.4 Commit: 13802163deb39fbffa73d72aa15568b6f2223fa6 Parents: 74001db Author: Tom Graves <tgra...@yahoo-inc.com> Authored: Thu Jun 25 08:27:08 2015 -0500 Committer: Tom Graves <tgra...@yahoo-inc.com> Committed: Thu Jun 25 08:27:56 2015 -0500 ---------------------------------------------------------------------- unsafe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/13802163/unsafe/pom.xml ---------------------------------------------------------------------- diff --git a/unsafe/pom.xml b/unsafe/pom.xml index 7298765..fa5085e 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: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
