Repository: incubator-beam Updated Branches: refs/heads/master b7d8c2c20 -> c2b27ff30
Adding explicit dependency to specific version of httpclient needed by Apex runner Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d90c9e14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d90c9e14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d90c9e14 Branch: refs/heads/master Commit: d90c9e1485dccad85eb9db38945e274b39bf1774 Parents: aebe067 Author: Pramod Immaneni <[email protected]> Authored: Thu Dec 22 22:13:39 2016 -0800 Committer: Pramod Immaneni <[email protected]> Committed: Sun Dec 25 14:23:09 2016 -0800 ---------------------------------------------------------------------- examples/java/pom.xml | 17 +++++++++++++++++ .../src/main/resources/archetype-resources/pom.xml | 17 +++++++++++++++++ .../src/main/resources/archetype-resources/pom.xml | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d90c9e14/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index f1e0fe1..f166a7f 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -67,6 +67,23 @@ <artifactId>beam-runners-apex</artifactId> <scope>runtime</scope> </dependency> + <!-- + Apex depends on httpclient version 4.3.5, project has a transitive dependency to httpclient 4.0.1 from + google-http-client. Apex dependency version being specified explicitly so that it gets picked up. This + can be removed when the project no longer has a dependency on a different httpclient version. + --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.5</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d90c9e14/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml index 615160c..59e793f 100644 --- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml @@ -102,6 +102,23 @@ <version>${beam.version}</version> <scope>runtime</scope> </dependency> + <!-- + Apex depends on httpclient version 4.3.5, project has a transitive dependency to httpclient 4.0.1 from + google-http-client. Apex dependency version being specified explicitly so that it gets picked up. This + can be removed when the project no longer has a dependency on a different httpclient version. + --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.5</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d90c9e14/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- 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 271fc0c..0a53678 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 @@ -148,6 +148,23 @@ <version>${beam.version}</version> <scope>runtime</scope> </dependency> + <!-- + Apex depends on httpclient version 4.3.5, project has a transitive dependency to httpclient 4.0.1 from + google-http-client. Apex dependency version being specified explicitly so that it gets picked up. This + can be removed when the project no longer has a dependency on a different httpclient version. + --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.5</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </profile>
