Repository: flink Updated Branches: refs/heads/master 87bf57816 -> 84d0677f9
[FLINK-7973] [filesystems] Fix shading patterns for META-INF/services entries Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/84d0677f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/84d0677f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/84d0677f Branch: refs/heads/master Commit: 84d0677f98f81d50411957103be82993e40f587a Parents: 87bf578 Author: Stephan Ewen <[email protected]> Authored: Fri Nov 3 15:12:41 2017 +0100 Committer: Stephan Ewen <[email protected]> Committed: Fri Nov 3 18:15:08 2017 +0100 ---------------------------------------------------------------------- flink-filesystems/flink-s3-fs-hadoop/pom.xml | 15 ++++++++++----- flink-filesystems/flink-s3-fs-presto/pom.xml | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/84d0677f/flink-filesystems/flink-s3-fs-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml index 1afec78..de7921d 100644 --- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml +++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml @@ -226,6 +226,7 @@ under the License. <goal>shade</goal> </goals> <configuration> + <shadeTestJar>false</shadeTestJar> <artifactSet> <includes> <include>*:*</include> @@ -234,23 +235,27 @@ under the License. <relocations> <relocation> <pattern>org</pattern> - <shadedPattern>org.apache.flink.s3hadoop.shaded.org</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.org</shadedPattern> + <excludes> + <exclude>org.apache.flink.core.fs.FileSystemFactory</exclude> + <exclude>org.apache.flink.fs.s3hadoop.**</exclude> + </excludes> </relocation> <relocation> <pattern>com</pattern> - <shadedPattern>org.apache.flink.s3hadoop.shaded.com</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.com</shadedPattern> </relocation> <relocation> <pattern>net</pattern> - <shadedPattern>org.apache.flink.s3hadoop.shaded.net</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.net</shadedPattern> </relocation> <relocation> <pattern>okio</pattern> - <shadedPattern>org.apache.flink.s3hadoop.shaded.okio</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.okio</shadedPattern> </relocation> <relocation> <pattern>software</pattern> - <shadedPattern>org.apache.flink.s3hadoop.shaded.software</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.software</shadedPattern> </relocation> </relocations> <filters> http://git-wip-us.apache.org/repos/asf/flink/blob/84d0677f/flink-filesystems/flink-s3-fs-presto/pom.xml ---------------------------------------------------------------------- diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index f7334c2..6c5ab49 100644 --- a/flink-filesystems/flink-s3-fs-presto/pom.xml +++ b/flink-filesystems/flink-s3-fs-presto/pom.xml @@ -226,6 +226,7 @@ under the License. <goal>shade</goal> </goals> <configuration> + <shadeTestJar>false</shadeTestJar> <artifactSet> <includes> <include>*:*</include> @@ -237,23 +238,27 @@ under the License. <relocations> <relocation> <pattern>org</pattern> - <shadedPattern>org.apache.flink.s3presto.shaded.org</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3presto.shaded.org</shadedPattern> + <excludes> + <exclude>org.apache.flink.core.fs.FileSystemFactory</exclude> + <exclude>org.apache.flink.fs.s3presto.**</exclude> + </excludes> </relocation> <relocation> <pattern>com</pattern> - <shadedPattern>org.apache.flink.s3presto.shaded.com</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3presto.shaded.com</shadedPattern> </relocation> <relocation> <pattern>io</pattern> - <shadedPattern>org.apache.flink.s3presto.shaded.io</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3presto.shaded.io</shadedPattern> </relocation> <relocation> <pattern>net</pattern> - <shadedPattern>org.apache.flink.s3presto.shaded.net</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3presto.shaded.net</shadedPattern> </relocation> <relocation> <pattern>software</pattern> - <shadedPattern>org.apache.flink.s3presto.shaded.software</shadedPattern> + <shadedPattern>org.apache.flink.fs.s3presto.shaded.software</shadedPattern> </relocation> </relocations> <filters>
