Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Commit f300ce3

Browse files
nickwallennickwallen
committed
METRON-2261 Isolate Curator Dependencies (nickwallen) closes #1515 
1 parent f6f0234 commit f300ce3

26 files changed

Lines changed: 959 additions & 117 deletions

File tree

‎metron-analytics/metron-maas-common/pom.xml‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software
4-
Foundation (ASF) under one or more contributor license agreements. See the
5-
NOTICE file distributed with this work for additional information regarding
6-
copyright ownership. The ASF licenses this file to You under the Apache License,
7-
Version 2.0 (the "License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
9-
Unless required by applicable law or agreed to in writing, software distributed
10-
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
11-
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
12-
the specific language governing permissions and limitations under the License.
2+
<!--
3+
Licensed to the Apache Software
4+
Foundation (ASF) under one or more contributor license agreements. See the
5+
NOTICE file distributed with this work for additional information regarding
6+
copyright ownership. The ASF licenses this file to You under the Apache License,
7+
Version 2.0 (the "License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
9+
Unless required by applicable law or agreed to in writing, software distributed
10+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
11+
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
12+
the specific language governing permissions and limitations under the License.
1313
-->
1414

1515
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -54,11 +54,25 @@
5454
<groupId>org.apache.curator</groupId>
5555
<artifactId>curator-recipes</artifactId>
5656
<version>${global_curator_version}</version>
57+
<exclusions>
58+
<exclusion>
59+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
60+
<groupId>org.apache.zookeeper</groupId>
61+
<artifactId>zookeeper</artifactId>
62+
</exclusion>
63+
</exclusions>
5764
</dependency>
5865
<dependency>
5966
<groupId>org.apache.curator</groupId>
6067
<artifactId>curator-x-discovery</artifactId>
6168
<version>${global_curator_version}</version>
69+
<exclusions>
70+
<exclusion>
71+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
72+
<groupId>org.apache.zookeeper</groupId>
73+
<artifactId>zookeeper</artifactId>
74+
</exclusion>
75+
</exclusions>
6276
</dependency>
6377
<dependency>
6478
<groupId>org.apache.httpcomponents</groupId>
@@ -83,8 +97,15 @@
8397
<dependency>
8498
<groupId>org.apache.curator</groupId>
8599
<artifactId>curator-test</artifactId>
86-
<version>${curator.version}</version>
100+
<version>${global_curator_test_version}</version>
87101
<scope>test</scope>
102+
<exclusions>
103+
<exclusion>
104+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
105+
<groupId>org.apache.zookeeper</groupId>
106+
<artifactId>zookeeper</artifactId>
107+
</exclusion>
108+
</exclusions>
88109
</dependency>
89110

90111
</dependencies>

‎metron-analytics/metron-maas-service/pom.xml‎

Lines changed: 59 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software
4-
Foundation (ASF) under one or more contributor license agreements. See the
5-
NOTICE file distributed with this work for additional information regarding
6-
copyright ownership. The ASF licenses this file to You under the Apache License,
7-
Version 2.0 (the "License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
9-
Unless required by applicable law or agreed to in writing, software distributed
10-
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
11-
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
12-
the specific language governing permissions and limitations under the License.
2+
<!--
3+
Licensed to the Apache Software
4+
Foundation (ASF) under one or more contributor license agreements. See the
5+
NOTICE file distributed with this work for additional information regarding
6+
copyright ownership. The ASF licenses this file to You under the Apache License,
7+
Version 2.0 (the "License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
9+
Unless required by applicable law or agreed to in writing, software distributed
10+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
11+
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
12+
the specific language governing permissions and limitations under the License.
1313
-->
1414

1515
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -59,6 +59,23 @@
5959
<artifactId>hadoop-yarn-server-common</artifactId>
6060
<version>${hadoop.version}</version>
6161
<scope>provided</scope>
62+
<exclusions>
63+
<exclusion>
64+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
65+
<groupId>org.apache.curator</groupId>
66+
<artifactId>curator-framework</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
70+
<groupId>org.apache.curator</groupId>
71+
<artifactId>curator-client</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
75+
<groupId>org.apache.curator</groupId>
76+
<artifactId>curator-recipes</artifactId>
77+
</exclusion>
78+
</exclusions>
6279
</dependency>
6380
<dependency>
6481
<groupId>org.apache.hadoop</groupId>
@@ -94,6 +111,13 @@
94111
<artifactId>hadoop-yarn-common</artifactId>
95112
<version>${hadoop.version}</version>
96113
<scope>provided</scope>
114+
<exclusions>
115+
<exclusion>
116+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
117+
<groupId>org.apache.curator</groupId>
118+
<artifactId>curator-framework</artifactId>
119+
</exclusion>
120+
</exclusions>
97121
</dependency>
98122
<dependency>
99123
<groupId>org.apache.hadoop</groupId>
@@ -119,16 +143,19 @@
119143
<scope>provided</scope>
120144
<exclusions>
121145
<exclusion>
122-
<groupId>org.apache.curator</groupId>
123-
<artifactId>curator-recipes</artifactId>
146+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
147+
<groupId>org.apache.curator</groupId>
148+
<artifactId>curator-framework</artifactId>
124149
</exclusion>
125150
<exclusion>
126-
<groupId>org.apache.curator</groupId>
127-
<artifactId>curator-client</artifactId>
151+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
152+
<groupId>org.apache.curator</groupId>
153+
<artifactId>curator-client</artifactId>
128154
</exclusion>
129155
<exclusion>
130-
<groupId>org.apache.curator</groupId>
131-
<artifactId>curator-framework</artifactId>
156+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x-->
157+
<groupId>org.apache.curator</groupId>
158+
<artifactId>curator-recipes</artifactId>
132159
</exclusion>
133160
<exclusion>
134161
<groupId>org.slf4j</groupId>
@@ -211,6 +238,21 @@
211238
<groupId>org.slf4j</groupId>
212239
<artifactId>slf4j-log4j12</artifactId>
213240
</exclusion>
241+
<exclusion>
242+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
243+
<groupId>org.apache.curator</groupId>
244+
<artifactId>curator-framework</artifactId>
245+
</exclusion>
246+
<exclusion>
247+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
248+
<groupId>org.apache.curator</groupId>
249+
<artifactId>curator-client</artifactId>
250+
</exclusion>
251+
<exclusion>
252+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
253+
<groupId>org.apache.curator</groupId>
254+
<artifactId>curator-recipes</artifactId>
255+
</exclusion>
214256
</exclusions>
215257
</dependency>
216258

‎metron-analytics/metron-profiler-spark/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
<groupId>org.apache.spark</groupId>
3333
<artifactId>spark-core_2.11</artifactId>
3434
<version>${global_spark_version}</version>
35+
<exclusions>
36+
<exclusion>
37+
<!-- to avoid pulling in curator 2.12.0 with spark 2.3.x -->
38+
<groupId>org.apache.curator</groupId>
39+
<artifactId>curator-recipes</artifactId>
40+
</exclusion>
41+
</exclusions>
3542
</dependency>
3643
<dependency>
3744
<groupId>org.apache.spark</groupId>

‎metron-analytics/metron-profiler-storm/pom.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,26 @@
6767
<groupId>org.apache.httpcomponents</groupId>
6868
<artifactId>httpclient</artifactId>
6969
</exclusion>
70+
<exclusion>
71+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
72+
<groupId>org.apache.curator</groupId>
73+
<artifactId>curator-framework</artifactId>
74+
</exclusion>
75+
<exclusion>
76+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
77+
<groupId>org.apache.curator</groupId>
78+
<artifactId>curator-client</artifactId>
79+
</exclusion>
80+
<exclusion>
81+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
82+
<groupId>org.apache.curator</groupId>
83+
<artifactId>curator-recipes</artifactId>
84+
</exclusion>
85+
<exclusion>
86+
<!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
87+
<groupId>org.apache.zookeeper</groupId>
88+
<artifactId>zookeeper</artifactId>
89+
</exclusion>
7090
</exclusions>
7191
</dependency>
7292
<dependency>
@@ -94,6 +114,21 @@
94114
<artifactId>commons-lang</artifactId>
95115
<groupId>commons-lang</groupId>
96116
</exclusion>
117+
<exclusion>
118+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
119+
<groupId>org.apache.curator</groupId>
120+
<artifactId>curator-client</artifactId>
121+
</exclusion>
122+
<exclusion>
123+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
124+
<groupId>org.apache.curator</groupId>
125+
<artifactId>curator-recipes</artifactId>
126+
</exclusion>
127+
<exclusion>
128+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
129+
<groupId>org.apache.curator</groupId>
130+
<artifactId>curator-framework</artifactId>
131+
</exclusion>
97132
</exclusions>
98133
</dependency>
99134
<dependency>

‎metron-interface/metron-rest/pom.xml‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2828
<java.version>1.8</java.version>
2929
<antlr.version>4.5</antlr.version>
30-
<curator.version>2.7.1</curator.version>
3130
<powermock.version>1.6.4</powermock.version>
3231
<spring.boot.version>2.0.1.RELEASE</spring.boot.version>
3332
<spring.kerberos.version>1.0.1.RELEASE</spring.kerberos.version>
@@ -127,7 +126,7 @@
127126
<dependency>
128127
<groupId>org.apache.curator</groupId>
129128
<artifactId>curator-recipes</artifactId>
130-
<version>${curator.version}</version>
129+
<version>${global_curator_version}</version>
131130
<exclusions>
132131
<exclusion>
133132
<groupId>com.google.guava</groupId>
@@ -137,6 +136,11 @@
137136
<groupId>log4j</groupId>
138137
<artifactId>log4j</artifactId>
139138
</exclusion>
139+
<exclusion>
140+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
141+
<groupId>org.apache.zookeeper</groupId>
142+
<artifactId>zookeeper</artifactId>
143+
</exclusion>
140144
</exclusions>
141145
</dependency>
142146
<dependency>
@@ -246,6 +250,21 @@
246250
<groupId>javax.servlet</groupId>
247251
<artifactId>servlet-api</artifactId>
248252
</exclusion>
253+
<exclusion>
254+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
255+
<groupId>org.apache.curator</groupId>
256+
<artifactId>curator-framework</artifactId>
257+
</exclusion>
258+
<exclusion>
259+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
260+
<groupId>org.apache.curator</groupId>
261+
<artifactId>curator-client</artifactId>
262+
</exclusion>
263+
<exclusion>
264+
<!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
265+
<groupId>org.apache.curator</groupId>
266+
<artifactId>curator-recipes</artifactId>
267+
</exclusion>
249268
</exclusions>
250269
</dependency>
251270
<dependency>

‎metron-platform/metron-common-streaming/metron-common-storm/pom.xml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,34 @@
7474
<artifactId>flux-core</artifactId>
7575
<version>${global_flux_version}</version>
7676
</dependency>
77+
<dependency>
78+
<groupId>org.apache.zookeeper</groupId>
79+
<artifactId>zookeeper</artifactId>
80+
<version>${global_zookeeper_version}</version>
81+
</dependency>
7782
<dependency>
7883
<groupId>org.apache.curator</groupId>
7984
<artifactId>curator-client</artifactId>
8085
<version>${global_curator_version}</version>
86+
<exclusions>
87+
<exclusion>
88+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
89+
<groupId>org.apache.zookeeper</groupId>
90+
<artifactId>zookeeper</artifactId>
91+
</exclusion>
92+
</exclusions>
8193
</dependency>
8294
<dependency>
8395
<groupId>org.apache.curator</groupId>
8496
<artifactId>curator-test</artifactId>
85-
<version>${global_curator_version}</version>
97+
<version>${global_curator_test_version}</version>
98+
<exclusions>
99+
<exclusion>
100+
<!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
101+
<groupId>org.apache.zookeeper</groupId>
102+
<artifactId>zookeeper</artifactId>
103+
</exclusion>
104+
</exclusions>
86105
<scope>test</scope>
87106
</dependency>
88107
<dependency>

0 commit comments

Comments
 (0)