You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/31 11:59:14 UTC
[07/12] flink git commit: [FLINK-7250] [build] Remove jdk8 profile
[FLINK-7250] [build] Remove jdk8 profile
This closes #4399.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/82c8e18a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/82c8e18a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/82c8e18a
Branch: refs/heads/master
Commit: 82c8e18a8f15c4e24da35138698597caaad2e58d
Parents: 0e553e0
Author: zentol <ch...@apache.org>
Authored: Mon Jul 24 13:14:33 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon Jul 31 12:12:09 2017 +0200
----------------------------------------------------------------------
.travis.yml | 20 ++++++++++----------
pom.xml | 35 +----------------------------------
2 files changed, 11 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/82c8e18a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 89365c5..a087f45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,52 +24,52 @@ matrix:
- jdk: "oraclejdk8"
env:
- TEST="core"
- - PROFILE="-Dhadoop.version=2.8.0 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.8.0"
- CACHE_NAME=JDK8_H280_CO
- jdk: "oraclejdk8"
env:
- TEST="libraries"
- - PROFILE="-Dhadoop.version=2.8.0 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.8.0"
- CACHE_NAME=JDK8_H280_L
- jdk: "oraclejdk8"
env:
- TEST="connectors"
- - PROFILE="-Dhadoop.version=2.8.0 -Pjdk8,include-kinesis"
+ - PROFILE="-Dhadoop.version=2.8.0 -Pinclude-kinesis"
- CACHE_NAME=JDK8_H280_CN
- jdk: "oraclejdk8"
env:
- TEST="tests"
- - PROFILE="-Dhadoop.version=2.8.0 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.8.0"
- CACHE_NAME=JDK8_H280_T
- jdk: "oraclejdk8"
env:
- TEST="misc"
- - PROFILE="-Dhadoop.version=2.8.0 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.8.0"
- CACHE_NAME=JDK8_H280_M
- jdk: "openjdk8"
env:
- TEST="core"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
- CACHE_NAME=JDK8_H241_CO
- jdk: "openjdk8"
env:
- TEST="libraries"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
- CACHE_NAME=JDK8_H241_L
- jdk: "openjdk8"
env:
- TEST="connectors"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pjdk8,include-kinesis"
+ - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pinclude-kinesis"
- CACHE_NAME=JDK8_H241_CN
- jdk: "openjdk8"
env:
- TEST="tests"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
- CACHE_NAME=JDK8_H241_T
- jdk: "openjdk8"
env:
- TEST="misc"
- - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pjdk8"
+ - PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10"
- CACHE_NAME=JDK8_H241_M
git:
http://git-wip-us.apache.org/repos/asf/flink/blob/82c8e18a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3287f61..132f73b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@ under the License.
<module>flink-shaded-curator</module>
<module>flink-core</module>
<module>flink-java</module>
+ <module>flink-java8</module>
<module>flink-scala</module>
<module>flink-runtime</module>
<module>flink-runtime-web</module>
@@ -830,40 +831,6 @@ under the License.
</pluginManagement>
</build>
</profile>
- <profile>
- <id>jdk8</id>
- <!-- do not activate automatically to prevent 1.8 target while Java 7 is the supported -->
- <properties>
- <java.version>1.8</java.version>
- </properties>
- <modules>
- <module>flink-java8</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version><!--$NO-MVN-MAN-VER$-->
- <configuration>
- <quiet>true</quiet>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <detectOfflineLinks>false</detectOfflineLinks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>