This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch java11_test in repository https://gitbox.apache.org/repos/asf/flink.git
commit 28280d4c506605e860b1930152bad30e9f450c5f Author: Chesnay Schepler <[email protected]> AuthorDate: Mon Sep 2 11:28:55 2019 +0200 move jaxb to actual fs module --- flink-filesystems/flink-fs-hadoop-shaded/pom.xml | 21 --------------------- flink-filesystems/flink-s3-fs-hadoop/pom.xml | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flink-filesystems/flink-fs-hadoop-shaded/pom.xml b/flink-filesystems/flink-fs-hadoop-shaded/pom.xml index 3114694..5a47cea 100644 --- a/flink-filesystems/flink-fs-hadoop-shaded/pom.xml +++ b/flink-filesystems/flink-fs-hadoop-shaded/pom.xml @@ -210,10 +210,6 @@ under the License. <relocations> <!-- we shade only the parts that are internal to Hadoop and not used / exposed downstream --> <relocation> - <pattern>javax.xml.bind</pattern> - <shadedPattern>org.apache.flink.fs.shaded.hadoop3.javax.xml.bind</shadedPattern> - </relocation> - <relocation> <pattern>com.google.re2j</pattern> <shadedPattern>org.apache.flink.fs.shaded.hadoop3.com.google.re2j</shadedPattern> </relocation> @@ -264,21 +260,4 @@ under the License. </plugin> </plugins> </build> - - <profiles> - <profile> - <id>java11</id> - <activation> - <jdk>11</jdk> - </activation> - <dependencies> - <dependency> - <!-- Hadoop requires jaxb-api for javax.xml.bind.JAXBException --> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> - </dependency> - </dependencies> - </profile> - </profiles> </project> diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml index b828858..f25ddcb 100644 --- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml +++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml @@ -98,6 +98,10 @@ under the License. <relocations> <!-- relocate the references to Hadoop to match the shaded Hadoop config --> <relocation> + <pattern>javax.xml.bind</pattern> + <shadedPattern>org.apache.flink.fs.shaded.hadoop3.javax.xml.bind</shadedPattern> + </relocation> + <relocation> <pattern>org.apache.hadoop</pattern> <shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop</shadedPattern> </relocation> @@ -127,4 +131,21 @@ under the License. </plugins> </build> + <profiles> + <profile> + <id>java11</id> + <activation> + <jdk>11</jdk> + </activation> + <dependencies> + <dependency> + <!-- Hadoop requires jaxb-api for javax.xml.bind.JAXBException --> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + </dependencies> + </profile> + </profiles> + </project>
