This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch release-2.3.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.3.0 by this push:
new 2fdb200 [BEAM-3668] Quick workaround fix for netty conflict waiting
better fix by BEAM-3519
2fdb200 is described below
commit 2fdb200cbedae64ff88c4fa624926b595b8aab90
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Sat Feb 10 08:39:21 2018 +0100
[BEAM-3668] Quick workaround fix for netty conflict waiting better fix by
BEAM-3519
---
sdks/java/io/hadoop-input-format/pom.xml | 3 +++
sdks/java/io/jdbc/pom.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 19 +++++++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/sdks/java/io/hadoop-input-format/pom.xml
b/sdks/java/io/hadoop-input-format/pom.xml
index 3bf3064..0fbd13a 100644
--- a/sdks/java/io/hadoop-input-format/pom.xml
+++ b/sdks/java/io/hadoop-input-format/pom.xml
@@ -75,6 +75,9 @@
<profile>
<id>spark-runner</id>
+ <properties>
+ <netty.version>4.0.43.Final</netty.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.beam</groupId>
diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml
index 3af599e..17eb9f5 100644
--- a/sdks/java/io/jdbc/pom.xml
+++ b/sdks/java/io/jdbc/pom.xml
@@ -40,6 +40,9 @@
<!-- Include the Apache Spark runner -P spark-runner -->
<profile>
<id>spark-runner</id>
+ <properties>
+ <netty.version>4.0.43.Final</netty.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.beam</groupId>
diff --git
a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index 9da3499..410e24b 100644
---
a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++
b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -243,6 +243,9 @@
<id>spark-runner</id>
<!-- Makes the SparkRunner available when running a pipeline.
Additionally,
overrides some Spark dependencies to Beam-compatible versions. -->
+ <properties>
+ <netty.version>4.0.43.Final</netty.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.beam</groupId>
@@ -274,6 +277,22 @@
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
+ <!-- [BEAM-3519] GCP IO exposes netty on its API surface, causing
conflicts with runners -->
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-sdks-java-io-google-cloud-platform</artifactId>
+ <version>${beam.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</profile>
</profiles>
--
To stop receiving notification emails like this one, please contact
jbono...@apache.org.
