Skip to content

Commit

Permalink
[FLINK-13455][build] Move jdk.tools exclusions out of dependency mana…
Browse files Browse the repository at this point in the history 
…gement
  • Loading branch information
@zentol
zentol committed Jul 31, 2019
1 parent 17ad784 commit dae4f8e
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 157 deletions.
34 changes: 7 additions & 27 deletions flink-connectors/flink-connector-filesystem/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
4 changes: 2 additions & 2 deletions flink-connectors/flink-connector-hive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
31 changes: 7 additions & 24 deletions flink-connectors/flink-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
34 changes: 7 additions & 27 deletions flink-filesystems/flink-hadoop-fs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
34 changes: 7 additions & 27 deletions flink-fs-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
46 changes: 21 additions & 25 deletions flink-yarn-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,41 @@ 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>
<groupId>org.apache.hadoop</groupId>
<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>
<groupId>org.apache.hadoop</groupId>
<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>
Expand Down Expand Up @@ -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>
32 changes: 7 additions & 25 deletions flink-yarn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit dae4f8e

Please sign in to comment.