Skip to content

Commit 45f976f

Browse files
elekelek
committed
HDDS-1113. Remove default dependencies from hadoop-ozone project. Contributed by Elek, Marton.
Closes apache#490
1 parent 2c3ec37 commit 45f976f

9 files changed

Lines changed: 139 additions & 69 deletions

File tree

‎hadoop-ozone/client/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
3333
<groupId>org.apache.hadoop</groupId>
3434
<artifactId>hadoop-ozone-common</artifactId>
3535
</dependency>
36+
<dependency>
37+
<groupId>junit</groupId>
38+
<artifactId>junit</artifactId>
39+
<scope>test</scope>
40+
</dependency>
3641
</dependencies>
3742
</project>

‎hadoop-ozone/common/pom.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,65 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
3434
<groupId>org.apache.commons</groupId>
3535
<artifactId>commons-compress</artifactId>
3636
</dependency>
37+
<dependency>
38+
<groupId>org.apache.hadoop</groupId>
39+
<artifactId>hadoop-common</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.hadoop</groupId>
43+
<artifactId>hadoop-hdfs</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.hadoop</groupId>
47+
<artifactId>hadoop-hdfs-client</artifactId>
48+
<exclusions>
49+
<exclusion>
50+
<groupId>com.squareup.okhttp</groupId>
51+
<artifactId>okhttp</artifactId>
52+
</exclusion>
53+
</exclusions>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.hadoop</groupId>
57+
<artifactId>hadoop-hdds-common</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.apache.hadoop</groupId>
61+
<artifactId>hadoop-hdds-server-framework</artifactId>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.hadoop</groupId>
65+
<artifactId>hadoop-hdds-server-scm</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.apache.hadoop</groupId>
69+
<artifactId>hadoop-hdds-container-service</artifactId>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.apache.hadoop</groupId>
73+
<artifactId>hadoop-hdds-client</artifactId>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.apache.hadoop</groupId>
77+
<artifactId>hadoop-hdds-tools</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>junit</groupId>
81+
<artifactId>junit</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.apache.hadoop</groupId>
86+
<artifactId>hadoop-common</artifactId>
87+
<scope>test</scope>
88+
<type>test-jar</type>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.apache.hadoop</groupId>
92+
<artifactId>hadoop-hdfs</artifactId>
93+
<scope>test</scope>
94+
<type>test-jar</type>
95+
</dependency>
3796
</dependencies>
3897

3998
<build>

‎hadoop-ozone/integration-test/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,29 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
9393
<type>test-jar</type>
9494
<scope>test</scope>
9595
</dependency>
96+
<dependency>
97+
<groupId>org.apache.hadoop</groupId>
98+
<artifactId>hadoop-hdds-server-scm</artifactId>
99+
<scope>test</scope>
100+
<type>test-jar</type>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.apache.hadoop</groupId>
104+
<artifactId>hadoop-hdds-container-service</artifactId>
105+
<scope>test</scope>
106+
<type>test-jar</type>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.apache.hadoop</groupId>
110+
<artifactId>hadoop-common</artifactId>
111+
<scope>test</scope>
112+
<type>test-jar</type>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.apache.hadoop</groupId>
116+
<artifactId>hadoop-hdfs</artifactId>
117+
<scope>test</scope>
118+
<type>test-jar</type>
119+
</dependency>
96120
</dependencies>
97121
</project>

‎hadoop-ozone/objectstore-service/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
6565
</dependency>
6666

6767

68+
<dependency>
69+
<groupId>junit</groupId>
70+
<artifactId>junit</artifactId>
71+
<scope>test</scope>
72+
</dependency>
73+
6874
<dependency>
6975
<groupId>io.swagger</groupId>
7076
<artifactId>swagger-annotations</artifactId>

‎hadoop-ozone/ozone-manager/pom.xml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,31 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
5656
<version>2.2.0</version>
5757
<scope>test</scope>
5858
</dependency>
59-
<dependency>
60-
<groupId>com.google.code.findbugs</groupId>
61-
<artifactId>findbugs</artifactId>
62-
<version>3.0.1</version>
63-
<scope>compile</scope>
64-
</dependency>
59+
<dependency>
60+
<groupId>com.google.code.findbugs</groupId>
61+
<artifactId>findbugs</artifactId>
62+
<version>3.0.1</version>
63+
<scope>provided</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.apache.hadoop</groupId>
67+
<artifactId>hadoop-common</artifactId>
68+
<scope>test</scope>
69+
<type>test-jar</type>
70+
</dependency>
71+
72+
<dependency>
73+
<groupId>org.apache.hadoop</groupId>
74+
<artifactId>hadoop-hdds-server-scm</artifactId>
75+
<scope>test</scope>
76+
<type>test-jar</type>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>junit</groupId>
81+
<artifactId>junit</artifactId>
82+
<scope>test</scope>
83+
</dependency>
6584

6685
</dependencies>
6786
<build>

‎hadoop-ozone/ozone-recon/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<modelVersion>4.0.0</modelVersion>
2525
<artifactId>ozone-recon</artifactId>
2626
<dependencies>
27+
<dependency>
28+
<groupId>org.apache.hadoop</groupId>
29+
<artifactId>hadoop-ozone-common</artifactId>
30+
</dependency>
2731
<dependency>
2832
<groupId>com.google.inject</groupId>
2933
<artifactId>guice</artifactId>

‎hadoop-ozone/pom.xml‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -199,68 +199,6 @@
199199
</dependencies>
200200
</dependencyManagement>
201201
<dependencies>
202-
<dependency>
203-
<groupId>org.apache.hadoop</groupId>
204-
<artifactId>hadoop-common</artifactId>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.apache.hadoop</groupId>
208-
<artifactId>hadoop-hdfs</artifactId>
209-
</dependency>
210-
<dependency>
211-
<groupId>org.apache.hadoop</groupId>
212-
<artifactId>hadoop-hdds-common</artifactId>
213-
</dependency>
214-
<dependency>
215-
<groupId>org.apache.hadoop</groupId>
216-
<artifactId>hadoop-hdds-server-framework</artifactId>
217-
</dependency>
218-
<dependency>
219-
<groupId>org.apache.hadoop</groupId>
220-
<artifactId>hadoop-hdds-server-scm</artifactId>
221-
</dependency>
222-
<dependency>
223-
<groupId>org.apache.hadoop</groupId>
224-
<artifactId>hadoop-hdds-container-service</artifactId>
225-
</dependency>
226-
<dependency>
227-
<groupId>org.apache.hadoop</groupId>
228-
<artifactId>hadoop-hdds-client</artifactId>
229-
</dependency>
230-
<dependency>
231-
<groupId>org.apache.hadoop</groupId>
232-
<artifactId>hadoop-hdds-tools</artifactId>
233-
</dependency>
234-
235-
<dependency>
236-
<groupId>org.apache.hadoop</groupId>
237-
<artifactId>hadoop-common</artifactId>
238-
<scope>test</scope>
239-
<type>test-jar</type>
240-
</dependency>
241-
<dependency>
242-
<groupId>org.apache.hadoop</groupId>
243-
<artifactId>hadoop-hdfs</artifactId>
244-
<scope>test</scope>
245-
<type>test-jar</type>
246-
</dependency>
247-
<dependency>
248-
<groupId>org.apache.hadoop</groupId>
249-
<artifactId>hadoop-hdds-server-scm</artifactId>
250-
<scope>test</scope>
251-
<type>test-jar</type>
252-
</dependency>
253-
<dependency>
254-
<groupId>org.apache.hadoop</groupId>
255-
<artifactId>hadoop-hdds-container-service</artifactId>
256-
<scope>test</scope>
257-
<type>test-jar</type>
258-
</dependency>
259-
<dependency>
260-
<groupId>junit</groupId>
261-
<artifactId>junit</artifactId>
262-
<scope>test</scope>
263-
</dependency>
264202
</dependencies>
265203

266204
<build>

‎hadoop-ozone/s3gateway/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
<groupId>org.apache.hadoop</groupId>
180180
<artifactId>hadoop-ozone-client</artifactId>
181181
</dependency>
182+
<dependency>
183+
<groupId>junit</groupId>
184+
<artifactId>junit</artifactId>
185+
<scope>test</scope>
186+
</dependency>
182187
<dependency>
183188
<groupId>org.mockito</groupId>
184189
<artifactId>mockito-core</artifactId>

‎hadoop-ozone/tools/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,17 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
8080
<version>3.0.1</version>
8181
<scope>provided</scope>
8282
</dependency>
83-
83+
<dependency>
84+
<groupId>junit</groupId>
85+
<artifactId>junit</artifactId>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.hadoop</groupId>
90+
<artifactId>hadoop-common</artifactId>
91+
<scope>test</scope>
92+
<type>test-jar</type>
93+
</dependency>
8494
<dependency>
8595
<groupId>org.apache.hadoop</groupId>
8696
<artifactId>hadoop-ozone-integration-test</artifactId>

0 commit comments

Comments
 (0)