Skip to content

Commit a69f4d8

Browse files
adoroszlaiadoroszlai
authored
HDDS-14644. Move test-utils code back to src/main (apache#9778)
1 parent 85f7d61 commit a69f4d8

File tree

44 files changed

+43
-63
lines changed

Some content is hidden

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

44 files changed

+43
-63
lines changed

‎hadoop-hdds/client/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<dependency>
9696
<groupId>org.apache.ozone</groupId>
9797
<artifactId>hdds-test-utils</artifactId>
98-
<type>test-jar</type>
9998
<scope>test</scope>
10099
</dependency>
101100
</dependencies>

‎hadoop-hdds/common/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
<dependency>
192192
<groupId>org.apache.ozone</groupId>
193193
<artifactId>hdds-test-utils</artifactId>
194-
<type>test-jar</type>
195194
<scope>test</scope>
196195
</dependency>
197196
<dependency>

‎hadoop-hdds/container-service/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@
258258
<dependency>
259259
<groupId>org.apache.ozone</groupId>
260260
<artifactId>hdds-test-utils</artifactId>
261-
<type>test-jar</type>
262261
<scope>test</scope>
263262
</dependency>
264263
</dependencies>

‎hadoop-hdds/framework/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@
328328
<dependency>
329329
<groupId>org.apache.ozone</groupId>
330330
<artifactId>hdds-test-utils</artifactId>
331-
<type>test-jar</type>
332331
<scope>test</scope>
333332
</dependency>
334333
<dependency>

‎hadoop-hdds/rocks-native/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<dependency>
5858
<groupId>org.apache.ozone</groupId>
5959
<artifactId>hdds-test-utils</artifactId>
60-
<type>test-jar</type>
6160
<scope>test</scope>
6261
</dependency>
6362
</dependencies>

‎hadoop-hdds/rocksdb-checkpoint-differ/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
<dependency>
100100
<groupId>org.apache.ozone</groupId>
101101
<artifactId>hdds-test-utils</artifactId>
102-
<type>test-jar</type>
103102
<scope>test</scope>
104103
</dependency>
105104
</dependencies>

‎hadoop-hdds/server-scm/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@
219219
<dependency>
220220
<groupId>org.apache.ozone</groupId>
221221
<artifactId>hdds-test-utils</artifactId>
222-
<type>test-jar</type>
223222
<scope>test</scope>
224223
</dependency>
225224
</dependencies>

‎hadoop-hdds/test-utils/pom.xml‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,76 +26,80 @@
2626
<description>Apache Ozone Distributed Data Store Test Utils</description>
2727

2828
<dependencies>
29-
<dependency>
30-
<groupId>org.apache.hadoop</groupId>
31-
<artifactId>hadoop-common</artifactId>
32-
<scope>provided</scope>
33-
<exclusions>
34-
<exclusion>
35-
<groupId>*</groupId>
36-
<artifactId>*</artifactId>
37-
</exclusion>
38-
</exclusions>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.apache.logging.log4j</groupId>
42-
<artifactId>log4j-core</artifactId>
43-
<scope>provided</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.jacoco</groupId>
47-
<artifactId>org.jacoco.core</artifactId>
48-
<scope>provided</scope>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.junit.platform</groupId>
52-
<artifactId>junit-platform-engine</artifactId>
53-
<scope>provided</scope>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.junit.platform</groupId>
57-
<artifactId>junit-platform-launcher</artifactId>
58-
<scope>provided</scope>
59-
</dependency>
6029
<dependency>
6130
<groupId>ch.qos.reload4j</groupId>
6231
<artifactId>reload4j</artifactId>
63-
<scope>test</scope>
6432
</dependency>
6533
<dependency>
6634
<groupId>com.google.guava</groupId>
6735
<artifactId>guava</artifactId>
68-
<scope>test</scope>
6936
</dependency>
7037
<dependency>
7138
<groupId>commons-io</groupId>
7239
<artifactId>commons-io</artifactId>
73-
<scope>test</scope>
7440
</dependency>
7541
<dependency>
7642
<groupId>jakarta.annotation</groupId>
7743
<artifactId>jakarta.annotation-api</artifactId>
78-
<scope>test</scope>
7944
</dependency>
8045
<dependency>
8146
<groupId>org.apache.commons</groupId>
8247
<artifactId>commons-lang3</artifactId>
83-
<scope>test</scope>
8448
</dependency>
8549
<dependency>
8650
<groupId>org.apache.logging.log4j</groupId>
8751
<artifactId>log4j-api</artifactId>
88-
<scope>test</scope>
8952
</dependency>
9053
<dependency>
9154
<groupId>org.apache.ratis</groupId>
9255
<artifactId>ratis-common</artifactId>
93-
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.assertj</groupId>
59+
<artifactId>assertj-core</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.junit.jupiter</groupId>
63+
<artifactId>junit-jupiter-api</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.mockito</groupId>
67+
<artifactId>mockito-core</artifactId>
9468
</dependency>
9569
<dependency>
9670
<groupId>org.slf4j</groupId>
9771
<artifactId>slf4j-api</artifactId>
98-
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.apache.hadoop</groupId>
75+
<artifactId>hadoop-common</artifactId>
76+
<scope>provided</scope>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>*</groupId>
80+
<artifactId>*</artifactId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.apache.logging.log4j</groupId>
86+
<artifactId>log4j-core</artifactId>
87+
<scope>provided</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.jacoco</groupId>
91+
<artifactId>org.jacoco.core</artifactId>
92+
<scope>provided</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.junit.platform</groupId>
96+
<artifactId>junit-platform-engine</artifactId>
97+
<scope>provided</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.junit.platform</groupId>
101+
<artifactId>junit-platform-launcher</artifactId>
102+
<scope>provided</scope>
99103
</dependency>
100104
</dependencies>
101105

hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/GenericTestUtils.java renamed to hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java

File renamed without changes.

hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/InputSubstream.java renamed to hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/InputSubstream.java

File renamed without changes.

0 commit comments

Comments
 (0)