Repository: atlas Updated Branches: refs/heads/branch-1.0 95ac4f489 -> 23e61364f
ATLAS-2919: Fixed issue with Cassandra and Netty Signed-off-by: apoorvnaik <apoorvn...@apache.org> (cherry picked from commit 3b8a34c51eeadb54adeed78bea1e1ec3b03e279f) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/23e61364 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/23e61364 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/23e61364 Branch: refs/heads/branch-1.0 Commit: 23e61364f8ce2a56a859c98affbbd3bcaf6170c0 Parents: 95ac4f4 Author: Zinovii Dmytriv <zinovii.dmytriv@verygood.systems> Authored: Sun Oct 21 10:45:47 2018 -0700 Committer: apoorvnaik <apoorvn...@apache.org> Committed: Sun Oct 21 10:47:11 2018 -0700 ---------------------------------------------------------------------- repository/pom.xml | 8 ++++++++ webapp/pom.xml | 12 ++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/23e61364/repository/pom.xml ---------------------------------------------------------------------- diff --git a/repository/pom.xml b/repository/pom.xml index 9896c73..92edf96 100755 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -97,6 +97,10 @@ <groupId>ch.qos.logback</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> </exclusions> <version>2.1.8</version> </dependency> @@ -189,6 +193,10 @@ <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/atlas/blob/23e61364/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index a1bb4c8..7c14f7c 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -76,6 +76,12 @@ <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-graphdb-impls</artifactId> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> + </exclusions> <type>pom</type> </dependency> @@ -93,6 +99,12 @@ <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-repository</artifactId> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>