Skip to content

Commit 694e9fa

Browse files
Apache9apurtell
Apache9
authored and
apurtell
committed
HBASE-26691 Replacing log4j with reload4j for branch-2.x (#4050)
Signed-off-by: Andrew Purtell <apurtell@apache.org> Conflicts: pom.xml
1 parent 2af6bb7 commit 694e9fa

File tree

33 files changed

+385
-295
lines changed

33 files changed

+385
-295
lines changed

‎hbase-archetypes/hbase-client-project/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
</dependency>
6666
<dependency>
6767
<groupId>org.slf4j</groupId>
68-
<artifactId>slf4j-log4j12</artifactId>
68+
<artifactId>slf4j-reload4j</artifactId>
6969
<scope>runtime</scope>
7070
</dependency>
7171
<dependency>
72-
<groupId>log4j</groupId>
73-
<artifactId>log4j</artifactId>
72+
<groupId>ch.qos.reload4j</groupId>
73+
<artifactId>reload4j</artifactId>
7474
<scope>runtime</scope>
7575
</dependency>
7676
<dependency>

‎hbase-archetypes/hbase-shaded-client-project/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
</dependency>
7272
<dependency>
7373
<groupId>org.slf4j</groupId>
74-
<artifactId>slf4j-log4j12</artifactId>
74+
<artifactId>slf4j-reload4j</artifactId>
7575
<scope>runtime</scope>
7676
</dependency>
7777
<dependency>
78-
<groupId>log4j</groupId>
79-
<artifactId>log4j</artifactId>
78+
<groupId>ch.qos.reload4j</groupId>
79+
<artifactId>reload4j</artifactId>
8080
<scope>runtime</scope>
8181
</dependency>
8282
<dependency>

‎hbase-assembly/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,11 @@
333333
</dependency>
334334
<dependency>
335335
<groupId>org.slf4j</groupId>
336-
<artifactId>slf4j-log4j12</artifactId>
336+
<artifactId>slf4j-reload4j</artifactId>
337337
</dependency>
338338
<dependency>
339-
<groupId>log4j</groupId>
340-
<artifactId>log4j</artifactId>
339+
<groupId>ch.qos.reload4j</groupId>
340+
<artifactId>reload4j</artifactId>
341341
</dependency>
342342
</dependencies>
343343
<profiles>

‎hbase-asyncfs/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@
150150
</dependency>
151151
<dependency>
152152
<groupId>org.slf4j</groupId>
153-
<artifactId>slf4j-log4j12</artifactId>
153+
<artifactId>slf4j-reload4j</artifactId>
154154
<scope>test</scope>
155155
</dependency>
156156
<dependency>
157-
<groupId>log4j</groupId>
158-
<artifactId>log4j</artifactId>
157+
<groupId>ch.qos.reload4j</groupId>
158+
<artifactId>reload4j</artifactId>
159159
<scope>test</scope>
160160
</dependency>
161161
</dependencies>

‎hbase-client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@
168168
</dependency>
169169
<dependency>
170170
<groupId>org.slf4j</groupId>
171-
<artifactId>slf4j-log4j12</artifactId>
171+
<artifactId>slf4j-reload4j</artifactId>
172172
<scope>test</scope>
173173
</dependency>
174174
<dependency>
175-
<groupId>log4j</groupId>
176-
<artifactId>log4j</artifactId>
175+
<groupId>ch.qos.reload4j</groupId>
176+
<artifactId>reload4j</artifactId>
177177
<scope>test</scope>
178178
</dependency>
179179
<dependency>

‎hbase-common/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@
232232
</dependency>
233233
<dependency>
234234
<groupId>org.slf4j</groupId>
235-
<artifactId>slf4j-log4j12</artifactId>
235+
<artifactId>slf4j-reload4j</artifactId>
236236
<scope>test</scope>
237237
</dependency>
238238
<dependency>
239-
<groupId>log4j</groupId>
240-
<artifactId>log4j</artifactId>
239+
<groupId>ch.qos.reload4j</groupId>
240+
<artifactId>reload4j</artifactId>
241241
<scope>test</scope>
242242
</dependency>
243243
<dependency>

‎hbase-endpoint/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@
229229
</dependency>
230230
<dependency>
231231
<groupId>org.slf4j</groupId>
232-
<artifactId>slf4j-log4j12</artifactId>
232+
<artifactId>slf4j-reload4j</artifactId>
233233
<scope>test</scope>
234234
</dependency>
235235
<dependency>
236-
<groupId>log4j</groupId>
237-
<artifactId>log4j</artifactId>
236+
<groupId>ch.qos.reload4j</groupId>
237+
<artifactId>reload4j</artifactId>
238238
<scope>test</scope>
239239
</dependency>
240240
</dependencies>

‎hbase-examples/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@
226226
</dependency>
227227
<dependency>
228228
<groupId>org.slf4j</groupId>
229-
<artifactId>slf4j-log4j12</artifactId>
229+
<artifactId>slf4j-reload4j</artifactId>
230230
<scope>test</scope>
231231
</dependency>
232232
<dependency>
233-
<groupId>log4j</groupId>
234-
<artifactId>log4j</artifactId>
233+
<groupId>ch.qos.reload4j</groupId>
234+
<artifactId>reload4j</artifactId>
235235
<scope>test</scope>
236236
</dependency>
237237
</dependencies>

‎hbase-hadoop-compat/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@
104104
</dependency>
105105
<dependency>
106106
<groupId>org.slf4j</groupId>
107-
<artifactId>slf4j-log4j12</artifactId>
107+
<artifactId>slf4j-reload4j</artifactId>
108108
<scope>test</scope>
109109
</dependency>
110110
<dependency>
111-
<groupId>log4j</groupId>
112-
<artifactId>log4j</artifactId>
111+
<groupId>ch.qos.reload4j</groupId>
112+
<artifactId>reload4j</artifactId>
113113
<scope>test</scope>
114114
</dependency>
115115
</dependencies>

‎hbase-hadoop2-compat/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ limitations under the License.
181181
</dependency>
182182
<dependency>
183183
<groupId>org.slf4j</groupId>
184-
<artifactId>slf4j-log4j12</artifactId>
184+
<artifactId>slf4j-reload4j</artifactId>
185185
<scope>test</scope>
186186
</dependency>
187187
<dependency>
188-
<groupId>log4j</groupId>
189-
<artifactId>log4j</artifactId>
188+
<groupId>ch.qos.reload4j</groupId>
189+
<artifactId>reload4j</artifactId>
190190
<scope>test</scope>
191191
</dependency>
192192
</dependencies>

0 commit comments

Comments
 (0)