Repository: flink Updated Branches: refs/heads/master 0c504306b -> 747288f11
[FLINK-8010][build] Bump remaining flink-shaded versions This closes #4971. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/747288f1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/747288f1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/747288f1 Branch: refs/heads/master Commit: 747288f114557456da7e8c63b177f48411b8df67 Parents: 0c50430 Author: zentol <ches...@apache.org> Authored: Tue Nov 7 15:36:49 2017 +0100 Committer: zentol <ches...@apache.org> Committed: Wed Nov 8 10:21:58 2017 +0100 ---------------------------------------------------------------------- pom.xml | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/747288f1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 37d280d..86b1c89 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,7 @@ under the License. <flink.forkCountTestPackage>${flink.forkCount}</flink.forkCountTestPackage> <flink.reuseForks>true</flink.reuseForks> <log4j.configuration>log4j-test.properties</log4j.configuration> + <flink.shaded.version>2.0</flink.shaded.version> <guava.version>18.0</guava.version> <akka.version>2.4.20</akka.version> <java.version>1.8</java.version> @@ -230,14 +231,34 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> + <artifactId>flink-shaded-asm</artifactId> + <version>5.0.4-${flink.shaded.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> <artifactId>flink-shaded-guava</artifactId> - <version>18.0-1.0</version> + <version>18.0-${flink.shaded.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-shaded-jackson</artifactId> - <version>${jackson.version}-2.0</version> + <version>${jackson.version}-${flink.shaded.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-shaded-netty</artifactId> + <!-- Don't upgrade for now. Netty versions >= 4.0.28.Final + contain an improvement by Netty, which slices a Netty buffer + instead of doing a memory copy [1] in the + LengthFieldBasedFrameDecoder. In some situations, this + interacts badly with our Netty pipeline leading to OutOfMemory + errors. + + [1] https://github.com/netty/netty/issues/3704 --> + <version>4.0.27.Final-${flink.shaded.version}</version> </dependency> <!-- This manages the 'javax.annotation' annotations (JSR305) --> @@ -272,12 +293,6 @@ under the License. </dependency> <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-asm</artifactId> - <version>5.0.4-1.0</version> - </dependency> - - <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> <version>1.1.1.3</version> @@ -486,20 +501,6 @@ under the License. </exclusions> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-netty</artifactId> - <!-- Don't upgrade for now. Netty versions >= 4.0.28.Final - contain an improvement by Netty, which slices a Netty buffer - instead of doing a memory copy [1] in the - LengthFieldBasedFrameDecoder. In some situations, this - interacts badly with our Netty pipeline leading to OutOfMemory - errors. - - [1] https://github.com/netty/netty/issues/3704 --> - <version>4.0.27.Final-1.0</version> - </dependency> - <!-- We have to define the versions for httpcore and httpclient here such that a consistent version is used by the shaded hadoop jars and the flink-yarn-test project because of MNG-5899.
