Skip to content

Commit 123aa1a

Browse files
kumaabkumaab
authored
Merge branch 'apache:master' into ranger_5246
2 parents 4ad7ea9 + 15da87a commit 123aa1a

File tree

155 files changed

+2568
-1614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+2568
-1614
lines changed

‎agents-audit/core/pom.xml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,21 @@
3737
<artifactId>hppc</artifactId>
3838
<version>${hppc.version}</version>
3939
</dependency>
40-
40+
<dependency>
41+
<groupId>com.fasterxml.jackson.core</groupId>
42+
<artifactId>jackson-core</artifactId>
43+
<version>${fasterxml.jackson.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.fasterxml.jackson.core</groupId>
47+
<artifactId>jackson-databind</artifactId>
48+
<version>${fasterxml.jackson.databind.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>commons-collections</groupId>
52+
<artifactId>commons-collections</artifactId>
53+
<version>${commons.collections.version}</version>
54+
</dependency>
4155
<dependency>
4256
<groupId>io.airlift</groupId>
4357
<artifactId>aircompressor</artifactId>
@@ -92,12 +106,6 @@
92106
<artifactId>mockito-core</artifactId>
93107
<scope>test</scope>
94108
</dependency>
95-
<dependency>
96-
<groupId>org.slf4j</groupId>
97-
<artifactId>log4j-over-slf4j</artifactId>
98-
<version>${slf4j.version}</version>
99-
<scope>test</scope>
100-
</dependency>
101109
<dependency>
102110
<groupId>org.testng</groupId>
103111
<artifactId>testng</artifactId>

‎agents-audit/dest-cloudwatch/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
<artifactId>aws-java-sdk-logs</artifactId>
3838
<version>${aws-java-sdk.version}</version>
3939
</dependency>
40+
<dependency>
41+
<groupId>com.google.code.findbugs</groupId>
42+
<artifactId>jsr305</artifactId>
43+
<version>${jsr305.version}</version>
44+
</dependency>
4045
<dependency>
4146
<groupId>org.apache.ranger</groupId>
4247
<artifactId>ranger-audit-core</artifactId>
@@ -49,12 +54,6 @@
4954
</dependency>
5055

5156
<!-- Test -->
52-
<dependency>
53-
<groupId>org.slf4j</groupId>
54-
<artifactId>log4j-over-slf4j</artifactId>
55-
<version>${slf4j.version}</version>
56-
<scope>test</scope>
57-
</dependency>
5857
<dependency>
5958
<groupId>org.testng</groupId>
6059
<artifactId>testng</artifactId>

‎agents-audit/dest-es/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,6 @@
209209
</dependency>
210210

211211
<!-- Test -->
212-
<dependency>
213-
<groupId>org.slf4j</groupId>
214-
<artifactId>log4j-over-slf4j</artifactId>
215-
<version>${slf4j.version}</version>
216-
<scope>test</scope>
217-
</dependency>
218212
<dependency>
219213
<groupId>org.testng</groupId>
220214
<artifactId>testng</artifactId>

‎agents-audit/dest-hdfs/pom.xml‎

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,13 @@
3434
<dependencies>
3535
<dependency>
3636
<groupId>org.apache.hadoop</groupId>
37-
<artifactId>hadoop-common</artifactId>
37+
<artifactId>hadoop-client-api</artifactId>
38+
<version>${hadoop.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-client-runtime</artifactId>
3843
<version>${hadoop.version}</version>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>com.google.guava</groupId>
42-
<artifactId>guava</artifactId>
43-
</exclusion>
44-
<exclusion>
45-
<groupId>io.netty</groupId>
46-
<artifactId>netty-handler</artifactId>
47-
</exclusion>
48-
<exclusion>
49-
<groupId>io.netty</groupId>
50-
<artifactId>netty-transport-native-epoll</artifactId>
51-
</exclusion>
52-
<exclusion>
53-
<groupId>log4j</groupId>
54-
<artifactId>*</artifactId>
55-
</exclusion>
56-
<exclusion>
57-
<groupId>net.minidev</groupId>
58-
<artifactId>json-smart</artifactId>
59-
</exclusion>
60-
<exclusion>
61-
<groupId>org.apache.commons</groupId>
62-
<artifactId>commons-compress</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>org.apache.commons</groupId>
66-
<artifactId>commons-configuration2</artifactId>
67-
</exclusion>
68-
<exclusion>
69-
<groupId>org.apache.commons</groupId>
70-
<artifactId>commons-text</artifactId>
71-
</exclusion>
72-
<exclusion>
73-
<groupId>org.apache.zookeeper</groupId>
74-
<artifactId>zookeeper</artifactId>
75-
</exclusion>
76-
<exclusion>
77-
<groupId>org.slf4j</groupId>
78-
<artifactId>*</artifactId>
79-
</exclusion>
80-
</exclusions>
8144
</dependency>
8245
<dependency>
8346
<groupId>org.apache.ranger</groupId>
@@ -92,12 +55,6 @@
9255
</dependency>
9356

9457
<!-- Test -->
95-
<dependency>
96-
<groupId>org.slf4j</groupId>
97-
<artifactId>log4j-over-slf4j</artifactId>
98-
<version>${slf4j.version}</version>
99-
<scope>test</scope>
100-
</dependency>
10158
<dependency>
10259
<groupId>org.testng</groupId>
10360
<artifactId>testng</artifactId>

‎agents-audit/dest-kafka/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
</dependency>
6060

6161
<!-- Test -->
62-
<dependency>
63-
<groupId>org.slf4j</groupId>
64-
<artifactId>log4j-over-slf4j</artifactId>
65-
<version>${slf4j.version}</version>
66-
<scope>test</scope>
67-
</dependency>
6862
<dependency>
6963
<groupId>org.testng</groupId>
7064
<artifactId>testng</artifactId>

‎agents-audit/dest-log4j/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444
</dependency>
4545

4646
<!-- Test -->
47-
<dependency>
48-
<groupId>org.slf4j</groupId>
49-
<artifactId>log4j-over-slf4j</artifactId>
50-
<version>${slf4j.version}</version>
51-
<scope>test</scope>
52-
</dependency>
5347
<dependency>
5448
<groupId>org.testng</groupId>
5549
<artifactId>testng</artifactId>

‎agents-audit/dest-solr/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@
117117
</dependency>
118118

119119
<!-- Test -->
120-
<dependency>
121-
<groupId>org.slf4j</groupId>
122-
<artifactId>log4j-over-slf4j</artifactId>
123-
<version>${slf4j.version}</version>
124-
<scope>test</scope>
125-
</dependency>
126120
<dependency>
127121
<groupId>org.testng</groupId>
128122
<artifactId>testng</artifactId>

‎agents-audit/orc-util/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
</dependency>
7878

7979
<!-- Test -->
80-
<dependency>
81-
<groupId>org.slf4j</groupId>
82-
<artifactId>log4j-over-slf4j</artifactId>
83-
<version>${slf4j.version}</version>
84-
<scope>test</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>org.testng</groupId>
8882
<artifactId>testng</artifactId>

‎agents-common/${project.build.directory}/hbase_cm_hbase.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎agents-common/${project.build.directory}/hbase_cm_hbase_roles.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)