You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2017/07/04 07:31:06 UTC

flink git commit: [FLINK-7032] [build] Overwrite inherited compiler versions from parent pom

Repository: flink
Updated Branches:
  refs/heads/master 236a34523 -> d17a4b9d0


[FLINK-7032] [build] Overwrite inherited compiler versions from parent pom

Default values for compiler version are 1.6 and were causing Intellij to
constantly switch language level to 1.6, which in turn was causing
compilation errors. It worked fine for compiling from console using
maven, because those values are separetly set in maven-compiler-plugin
configuration.

This closes #4213.


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

Branch: refs/heads/master
Commit: d17a4b9d0a0af9b7fdb2068ff2d32f4e76755f86
Parents: 236a345
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Wed Jun 28 20:30:08 2017 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Tue Jul 4 09:30:08 2017 +0200

----------------------------------------------------------------------
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d17a4b9d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2115f12..92a827a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,11 @@ under the License.
 		<guava.version>18.0</guava.version>
 		<akka.version>2.3-custom</akka.version>
 		<java.version>1.7</java.version>
+		<!-- Overwrite default values from parent pom.
+			 Intellij is (sometimes?) using those values to choose target language level
+			 and thus is changing back to java 1.6 on each maven re-import -->
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<scala.macros.version>2.1.0</scala.macros.version>
 		<!-- Default scala versions, may be overwritten by build profiles -->
 		<scala.version>2.11.11</scala.version>