Skip to content

Commit 248db00

Browse files
fmbenhassinefmbenhassine
committed
Improve build output
- Remove verbose logging - Replace SLF4J with Log4j
1 parent 3466700 commit 248db00

File tree

20 files changed

+108
-119
lines changed

20 files changed

+108
-119
lines changed

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<xmlunit.version>2.10.4</xmlunit.version>
9696
<commons-io.version>2.20.0</commons-io.version>
9797
<commons-dbcp2.version>2.13.0</commons-dbcp2.version>
98-
<slf4j.version>2.0.17</slf4j.version>
9998
<hsqldb.version>2.7.4</hsqldb.version>
10099
<h2.version>2.4.240</h2.version>
101100
<sqlite.version>3.50.3.0</sqlite.version>

‎spring-batch-core/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@
108108
<version>${spring-data-mongodb.version}</version>
109109
<optional>true</optional>
110110
<exclusions>
111-
<exclusion>
112-
<groupId>org.slf4j</groupId>
113-
<artifactId>slf4j-api</artifactId>
114-
</exclusion>
115111
<exclusion>
116112
<groupId>org.mongodb</groupId>
117113
<artifactId>mongodb-driver-core</artifactId>
@@ -264,10 +260,6 @@
264260
<version>${sqlite.version}</version>
265261
<scope>test</scope>
266262
<exclusions>
267-
<exclusion>
268-
<groupId>org.slf4j</groupId>
269-
<artifactId>slf4j-api</artifactId>
270-
</exclusion>
271263
</exclusions>
272264
</dependency>
273265
<dependency>
@@ -324,12 +316,12 @@
324316
<version>${spring-framework.version}</version>
325317
<scope>test</scope>
326318
</dependency>
327-
<dependency>
328-
<groupId>org.slf4j</groupId>
329-
<artifactId>slf4j-simple</artifactId>
330-
<version>${slf4j.version}</version>
331-
<scope>test</scope>
332-
</dependency>
319+
<dependency>
320+
<groupId>org.apache.logging.log4j</groupId>
321+
<artifactId>log4j-core</artifactId>
322+
<version>${log4j.version}</version>
323+
<scope>test</scope>
324+
</dependency>
333325
<dependency>
334326
<groupId>org.mockito</groupId>
335327
<artifactId>mockito-junit-jupiter</artifactId>

‎spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemReader.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public void setMax(int max) {
6666
if (index >= input.length || index >= max) {
6767
return null;
6868
}
69-
logger.info(String.format("Processing input index=%s, item=%s, in (%s)", index, input[index], this));
7069
if (fail && index == 4) {
7170
synchronized (ExampleItemReader.class) {
7271
if (fail) {

‎spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemWriter.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,14 @@
1818
import java.util.ArrayList;
1919
import java.util.List;
2020

21-
import org.apache.commons.logging.Log;
22-
import org.apache.commons.logging.LogFactory;
23-
2421
import org.springframework.batch.infrastructure.item.Chunk;
2522
import org.springframework.batch.infrastructure.item.ItemWriter;
2623

2724
/**
28-
* Dummy {@link ItemWriter} which only logs data it receives.
25+
* Dummy {@link ItemWriter}.
2926
*/
3027
public class ExampleItemWriter implements ItemWriter<String> {
3128

32-
private static final Log log = LogFactory.getLog(ExampleItemWriter.class);
33-
3429
private static final List<String> items = new ArrayList<>();
3530

3631
public static void clear() {
@@ -46,7 +41,6 @@ public static List<String> getItems() {
4641
*/
4742
@Override
4843
public void write(Chunk<? extends String> data) throws Exception {
49-
log.info(data);
5044
items.addAll(data.getItems());
5145
}
5246

‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/JacksonExecutionContextStringSerializerIntegrationTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon
8888
contribution.getStepExecution().getExecutionContext().put("failed", true);
8989
throw new Exception("Expected failure");
9090
}
91-
System.out.println("Hello world!");
9291
contribution.getStepExecution().getExecutionContext().put("failed", false);
9392
return RepeatStatus.FINISHED;
9493
}

‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MongoDBJobRepositoryIntegrationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ void testJobExecution(@Autowired JobOperator jobOperator, @Autowired Job job) th
8181
Assertions.assertEquals(2, stepExecutionsCollection.countDocuments());
8282

8383
// dump results for inspection
84-
dump(jobInstancesCollection, "job instance = ");
85-
dump(jobExecutionsCollection, "job execution = ");
86-
dump(stepExecutionsCollection, "step execution = ");
84+
// dump(jobInstancesCollection, "job instance = ");
85+
// dump(jobExecutionsCollection, "job execution = ");
86+
// dump(stepExecutionsCollection, "step execution = ");
8787
}
8888

8989
private static void dump(MongoCollection<Document> collection, String prefix) {

‎spring-batch-core/src/test/resources/log4j2-test.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Logger name="org.springframework.batch" level="info" />
10+
<Root level="error">
11+
<AppenderRef ref="Console" />
12+
</Root>
13+
</Loggers>
14+
</Configuration>

‎spring-batch-infrastructure/pom.xml‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@
9797
<groupId>com.fasterxml.jackson.core</groupId>
9898
<artifactId>jackson-core</artifactId>
9999
</exclusion>
100-
<exclusion>
101-
<groupId>org.slf4j</groupId>
102-
<artifactId>slf4j-api</artifactId>
103-
</exclusion>
104100
</exclusions>
105101
</dependency>
106102
<dependency>
@@ -150,23 +146,13 @@
150146
<artifactId>spring-data-commons</artifactId>
151147
<version>${spring-data-commons.version}</version>
152148
<optional>true</optional>
153-
<exclusions>
154-
<exclusion>
155-
<groupId>org.slf4j</groupId>
156-
<artifactId>slf4j-api</artifactId>
157-
</exclusion>
158-
</exclusions>
159149
</dependency>
160150
<dependency>
161151
<groupId>org.springframework.data</groupId>
162152
<artifactId>spring-data-mongodb</artifactId>
163153
<version>${spring-data-mongodb.version}</version>
164154
<optional>true</optional>
165155
<exclusions>
166-
<exclusion>
167-
<groupId>org.slf4j</groupId>
168-
<artifactId>slf4j-api</artifactId>
169-
</exclusion>
170156
<exclusion>
171157
<groupId>org.springframework.data</groupId>
172158
<artifactId>spring-data-commons</artifactId>
@@ -187,10 +173,6 @@
187173
<version>${spring-data-jpa.version}</version>
188174
<optional>true</optional>
189175
<exclusions>
190-
<exclusion>
191-
<groupId>org.slf4j</groupId>
192-
<artifactId>slf4j-api</artifactId>
193-
</exclusion>
194176
<exclusion>
195177
<groupId>org.springframework</groupId>
196178
<artifactId>spring-expression</artifactId>
@@ -202,12 +184,6 @@
202184
<artifactId>spring-data-redis</artifactId>
203185
<version>${spring-data-redis.version}</version>
204186
<optional>true</optional>
205-
<exclusions>
206-
<exclusion>
207-
<groupId>org.slf4j</groupId>
208-
<artifactId>slf4j-api</artifactId>
209-
</exclusion>
210-
</exclusions>
211187
</dependency>
212188
<dependency>
213189
<groupId>org.mongodb</groupId>
@@ -226,12 +202,6 @@
226202
<artifactId>spring-ldap-core</artifactId>
227203
<version>${spring-ldap.version}</version>
228204
<optional>true</optional>
229-
<exclusions>
230-
<exclusion>
231-
<groupId>org.slf4j</groupId>
232-
<artifactId>slf4j-api</artifactId>
233-
</exclusion>
234-
</exclusions>
235205
</dependency>
236206
<dependency>
237207
<groupId>org.springframework.ldap</groupId>
@@ -307,12 +277,12 @@
307277
<version>${commons-dbcp2.version}</version>
308278
<scope>test</scope>
309279
</dependency>
310-
<dependency>
311-
<groupId>org.slf4j</groupId>
312-
<artifactId>slf4j-simple</artifactId>
313-
<version>${slf4j.version}</version>
314-
<scope>test</scope>
315-
</dependency>
280+
<dependency>
281+
<groupId>org.apache.logging.log4j</groupId>
282+
<artifactId>log4j-core</artifactId>
283+
<version>${log4j.version}</version>
284+
<scope>test</scope>
285+
</dependency>
316286
<dependency>
317287
<groupId>org.hsqldb</groupId>
318288
<artifactId>hsqldb</artifactId>

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/infrastructure/item/database/JdbcPagingItemReaderAsyncTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ private void doTest() throws Exception {
115115
do {
116116
next = reader.read();
117117
Thread.sleep(10L);
118-
logger.debug("Reading item: " + next);
119118
if (next != null) {
120119
list.add(next);
121120
}

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/infrastructure/item/database/JpaPagingItemReaderAsyncTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ private void doTest() throws Exception, InterruptedException, ExecutionException
110110
do {
111111
next = reader.read();
112112
Thread.sleep(10L);
113-
logger.debug("Reading item: " + next);
114113
if (next != null) {
115114
list.add(next);
116115
}

0 commit comments

Comments
 (0)