This is an automated email from the ASF dual-hosted git repository. sidmishra pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push: new dfdb1c7 ATLAS-4351 Reverted the changes dfdb1c7 is described below commit dfdb1c79bb4a26431fa7df7ca6f4fe7a7be64b3f Author: Sidharth Mishra <sidharthkmis...@gmail.com> AuthorDate: Thu Oct 28 14:07:52 2021 -0700 ATLAS-4351 Reverted the changes Signed-off-by: Sidharth Mishra <sidmis...@apache.org> (cherry picked from commit 8ed4c5e7cb3c7efb6a39e5c8342b5ff90d5810be) --- addons/falcon-bridge/pom.xml | 6 ---- addons/hbase-bridge/pom.xml | 8 ----- addons/hbase-testing-util/pom.xml | 10 ------ addons/hive-bridge/pom.xml | 16 --------- addons/impala-bridge/pom.xml | 16 --------- addons/kafka-bridge/pom.xml | 8 ----- addons/sqoop-bridge/pom.xml | 24 ------------- addons/storm-bridge-shim/pom.xml | 4 --- addons/storm-bridge/pom.xml | 14 -------- common/pom.xml | 8 ----- graphdb/janus-hbase2/pom.xml | 10 ------ graphdb/janus/pom.xml | 36 -------------------- pom.xml | 10 +----- test-tools/pom.xml | 36 -------------------- webapp/pom.xml | 72 ++++----------------------------------- 15 files changed, 8 insertions(+), 270 deletions(-) diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 36aaa75..a1c1972 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -106,12 +106,6 @@ <artifactId>atlas-graphdb-impls</artifactId> <type>pom</type> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 32984fe..439943a 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -51,14 +51,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml index 3b290a5..e6c858a 100644 --- a/addons/hbase-testing-util/pom.xml +++ b/addons/hbase-testing-util/pom.xml @@ -47,16 +47,6 @@ <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 7306bc3..5385010 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -60,14 +60,6 @@ <groupId>com.github.stephenc.findbugs</groupId> <artifactId>findbugs-annotations</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> </exclusions> </dependency> @@ -82,14 +74,6 @@ <groupId>javax.servlet</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml index 11a8323..d623885 100644 --- a/addons/impala-bridge/pom.xml +++ b/addons/impala-bridge/pom.xml @@ -189,14 +189,6 @@ <groupId>javax.servlet</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> @@ -218,14 +210,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml index 95dd37b..f721a12 100644 --- a/addons/kafka-bridge/pom.xml +++ b/addons/kafka-bridge/pom.xml @@ -129,14 +129,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml index 453ff71..5975462 100644 --- a/addons/sqoop-bridge/pom.xml +++ b/addons/sqoop-bridge/pom.xml @@ -56,14 +56,6 @@ <groupId>com.github.stephenc.findbugs</groupId> <artifactId>findbugs-annotations</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> </exclusions> </dependency> @@ -73,16 +65,6 @@ <artifactId>hive-exec</artifactId> <version>${hive.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -179,12 +161,6 @@ <artifactId>atlas-graphdb-impls</artifactId> <type>pom</type> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> diff --git a/addons/storm-bridge-shim/pom.xml b/addons/storm-bridge-shim/pom.xml index 3adb556..510718c 100755 --- a/addons/storm-bridge-shim/pom.xml +++ b/addons/storm-bridge-shim/pom.xml @@ -64,10 +64,6 @@ <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-ganglia</artifactId> </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index ac641b2..e50124d 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -60,14 +60,6 @@ <groupId>javax.servlet</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> <scope>provided</scope> </dependency> @@ -171,12 +163,6 @@ <artifactId>atlas-graphdb-impls</artifactId> <type>pom</type> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/common/pom.xml b/common/pom.xml index a3b806b..3252d57 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -57,14 +57,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/graphdb/janus-hbase2/pom.xml b/graphdb/janus-hbase2/pom.xml index 0077c7d..7ee0603 100644 --- a/graphdb/janus-hbase2/pom.xml +++ b/graphdb/janus-hbase2/pom.xml @@ -76,16 +76,6 @@ <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml index 78fc42e..ddd633e 100644 --- a/graphdb/janus/pom.xml +++ b/graphdb/janus/pom.xml @@ -135,10 +135,6 @@ <groupId>ch.qos.logback</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> </exclusions> </dependency> @@ -207,38 +203,6 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-resolver</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-unix-common</artifactId> - </exclusion> </exclusions> </dependency> <!-- CVE Overrides for Lucene --> diff --git a/pom.xml b/pom.xml index 023de75..c1cd69d 100644 --- a/pom.xml +++ b/pom.xml @@ -1638,14 +1638,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> @@ -1685,7 +1677,7 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>3.3.0</version> + <version>2.2.2</version> </dependency> </dependencies> diff --git a/test-tools/pom.xml b/test-tools/pom.xml index dd6e8eb..24bb504 100644 --- a/test-tools/pom.xml +++ b/test-tools/pom.xml @@ -57,42 +57,6 @@ <artifactId>log4j-slf4j-impl</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-resolver</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-unix-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> </exclusion> diff --git a/webapp/pom.xml b/webapp/pom.xml index b5d52ba..68658a1 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -98,12 +98,6 @@ <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.lz4</groupId> - <artifactId>lz4-java</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -114,14 +108,6 @@ <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> </exclusion> - <exclusion> - <groupId>com.boundary</groupId> - <artifactId>high-scale-lib</artifactId> - </exclusion> - <exclusion> - <groupId>net.jpountz.lz4</groupId> - <artifactId>lz4</artifactId> - </exclusion> </exclusions> </dependency> @@ -160,10 +146,6 @@ <groupId>org.noggit</groupId> <artifactId>noggit</artifactId> </exclusion> - <exclusion> - <groupId>com.boundary</groupId> - <artifactId>high-scale-lib</artifactId> - </exclusion> </exclusions> </dependency> @@ -179,18 +161,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> </exclusions> </dependency> @@ -241,16 +211,8 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - </exclusions> + + </dependency> <!-- supports simple auth handler --> <dependency> @@ -343,12 +305,6 @@ <artifactId>guice</artifactId> <version>${guice.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -393,34 +349,16 @@ <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-web</artifactId> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -446,7 +384,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </dependency> - + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.8.9</version> + </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId>