Skip to content

Commit

Permalink
[FLINK-7250] [build] Remove jdk8 profile
Browse files Browse the repository at this point in the history
This closes apache#4399.
  • Loading branch information
zentol committed Jul 31, 2017
1 parent 0e553e0 commit 82c8e18
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 44 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
35 changes: 1 addition & 34 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 82c8e18

Please sign in to comment.