You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/09/27 17:47:17 UTC
[2/2] flink git commit: [FLINK-4560] [build] Enforcer Java version >=
1.7 via Maven enforcer plugin
[FLINK-4560] [build] Enforcer Java version >= 1.7 via Maven enforcer plugin
This closes #2458
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b928935b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b928935b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b928935b
Branch: refs/heads/master
Commit: b928935b8c5be02b23dd2cb87144ae1ea001278c
Parents: f1b5b35
Author: shijinkui <sh...@huawei.com>
Authored: Fri Sep 2 10:46:45 2016 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Sep 27 19:46:40 2016 +0200
----------------------------------------------------------------------
pom.xml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b928935b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e517e9..b2229fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@ under the License.
<slf4j.version>1.7.7</slf4j.version>
<guava.version>18.0</guava.version>
<akka.version>2.3.7</akka.version>
+ <java.version>1.7</java.version>
<scala.macros.version>2.0.1</scala.macros.version>
<!-- Default scala versions, may be overwritten by build profiles -->
<scala.version>2.10.4</scala.version>
@@ -929,8 +930,8 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version><!--$NO-MVN-MAN-VER$-->
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
<!-- The output of Xlint is not shown by default, but we activate it for the QA bot
to be able to get more warnings -->
<compilerArgument>-Xlint:all</compilerArgument>
@@ -999,7 +1000,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version><!--$NO-MVN-MAN-VER$-->
+ <version>1.4.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<id>enforce-maven</id>
@@ -1012,6 +1013,9 @@ under the License.
<!-- enforce at least mvn version 3.0.3 -->
<version>[3.0.3,)</version>
</requireMavenVersion>
+ <requireJavaVersion>
+ <version>${java.version}</version>
+ </requireJavaVersion>
</rules>
</configuration>
</execution>