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 2019/07/31 19:53:13 UTC
[flink] branch master updated: [FLINK-13455][build] Move jdk.tools
exclusions out of dependency management
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new dae4f8e [FLINK-13455][build] Move jdk.tools exclusions out of dependency management
dae4f8e is described below
commit dae4f8e0a0d92551e881c2a25359b2409109653f
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Jul 29 08:50:39 2019 +0200
[FLINK-13455][build] Move jdk.tools exclusions out of dependency management
---
.../flink-connector-filesystem/pom.xml | 34 ++++------------
flink-connectors/flink-connector-hive/pom.xml | 4 +-
flink-connectors/flink-hbase/pom.xml | 31 ++++-----------
flink-filesystems/flink-hadoop-fs/pom.xml | 34 ++++------------
flink-fs-tests/pom.xml | 34 ++++------------
flink-yarn-tests/pom.xml | 46 ++++++++++------------
flink-yarn/pom.xml | 32 ++++-----------
7 files changed, 58 insertions(+), 157 deletions(-)
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 278b7f4..b984a71 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -127,6 +127,13 @@ under the License.
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -160,31 +167,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>
diff --git a/flink-connectors/flink-connector-hive/pom.xml b/flink-connectors/flink-connector-hive/pom.xml
index 3b4bc61..7dc953c 100644
--- a/flink-connectors/flink-connector-hive/pom.xml
+++ b/flink-connectors/flink-connector-hive/pom.xml
@@ -420,7 +420,7 @@ under the License.
<artifactId>tez-mapreduce</artifactId>
</exclusion>
<exclusion>
- <!-- This dependency is not available with java 9.-->
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
@@ -460,7 +460,7 @@ under the License.
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
- <!-- This dependency is not available with java 9.-->
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index aff1d2c..a9d3c22 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -257,6 +257,13 @@ under the License.
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -322,30 +329,6 @@ under the License.
</dependencies>
</dependencyManagement>
</profile>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
</profiles>
</project>
diff --git a/flink-filesystems/flink-hadoop-fs/pom.xml b/flink-filesystems/flink-hadoop-fs/pom.xml
index ba9d24d..7ddbbd2 100644
--- a/flink-filesystems/flink-hadoop-fs/pom.xml
+++ b/flink-filesystems/flink-hadoop-fs/pom.xml
@@ -72,6 +72,13 @@ under the License.
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -91,31 +98,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index c21a0c8..9fd75c2 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -107,6 +107,13 @@ under the License.
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -141,31 +148,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index bfbbddc..2bf362f 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -139,6 +139,13 @@ under the License.
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -146,6 +153,13 @@ under the License.
<artifactId>hadoop-yarn-client</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -153,6 +167,13 @@ under the License.
<artifactId>hadoop-yarn-api</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -391,29 +412,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index a1fc740..fada5f3 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -96,6 +96,13 @@ under the License.
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- This dependency is no longer shipped with the JDK since Java 9.-->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -155,31 +162,6 @@ under the License.
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <!-- This dependency is not available with java 9.-->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
</profiles>
<build>