Skip to content

Commit 96c0837

Browse files
car031car031
committed
less console logs during tests
1 parent eb2f8d3 commit 96c0837

File tree

5 files changed

+29
-73
lines changed

5 files changed

+29
-73
lines changed

‎logicaldoc-core/pom.xml‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,7 @@
3838
<artifactId>javax.mail</artifactId>
3939
<scope>provided</scope>
4040
</dependency>
41-
<dependency>
42-
<groupId>org.apache.logging.log4j</groupId>
43-
<artifactId>log4j-slf4j2-impl</artifactId>
44-
<scope>provided</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.apache.logging.log4j</groupId>
48-
<artifactId>log4j-api</artifactId>
49-
<scope>provided</scope>
50-
</dependency>
41+
5142
<dependency>
5243
<groupId>org.apache.commons</groupId>
5344
<artifactId>commons-collections4</artifactId>
@@ -218,11 +209,6 @@
218209
<groupId>net.sf.ehcache.internal</groupId>
219210
<artifactId>ehcache-core</artifactId>
220211
</dependency>
221-
<dependency>
222-
<groupId>org.slf4j</groupId>
223-
<artifactId>slf4j-api</artifactId>
224-
<scope>provided</scope>
225-
</dependency>
226212
<dependency>
227213
<groupId>org.quartz-scheduler</groupId>
228214
<artifactId>quartz</artifactId>
@@ -252,8 +238,6 @@
252238
<groupId>com.logicaldoc</groupId>
253239
<artifactId>logicaldoc-util</artifactId>
254240
<version>${project.version}</version>
255-
<type>jar</type>
256-
<scope>provided</scope>
257241
</dependency>
258242
<dependency>
259243
<groupId>org.jsoup</groupId>
@@ -568,6 +552,12 @@
568552
<artifactId>jsr305</artifactId>
569553
<version>3.0.2</version>
570554
</dependency>
555+
<dependency>
556+
<groupId>org.apache.logging.log4j</groupId>
557+
<artifactId>log4j-slf4j-impl</artifactId>
558+
<version>2.24.3</version>
559+
<scope>test</scope>
560+
</dependency>
571561
</dependencies>
572562
<build>
573563
<plugins>

‎logicaldoc-core/src/test/resources/log4j2.xml‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,14 @@
4444
<Logger name="org.apache.cxf" level="fatal" additivity="false">
4545
<Appender-Ref ref="file" />
4646
</Logger>
47-
<Logger name="com.logicaldoc.core.searchengine" level="error"
48-
additivity="false">
49-
<Appender-Ref ref="file" />
50-
</Logger>
51-
<Logger name="com.logicaldoc" level="warn" additivity="false">
47+
<Logger name="com.logicaldoc" level="error" additivity="false">
5248
<Appender-Ref ref="file" />
5349
</Logger>
5450
<Logger name="com.logicaldoc.util.spring.DatabasePropertySource"
5551
level="fatal" additivity="false">
5652
<Appender-Ref ref="file" />
5753
</Logger>
58-
<Logger name="com.zaxxer.hikari" level="debug" additivity="false">
54+
<Logger name="com.zaxxer.hikari" level="error" additivity="false">
5955
<AppenderRef ref="hikari" />
6056
</Logger>
6157
<Logger name="java.sql" level="error" additivity="false">
@@ -65,19 +61,6 @@
6561
<AppenderRef ref="file" />
6662
</Logger>
6763

68-
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl" level="info" additivity="false">
69-
<AppenderRef ref="file" />
70-
</Logger>
71-
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug" additivity="false">
72-
<AppenderRef ref="file" />
73-
</Logger>
74-
<Logger name="org.hsqldb" level="debug" additivity="false">
75-
<AppenderRef ref="file" />
76-
</Logger>
77-
<Logger name="org.hibernate" level="debug" additivity="false">
78-
<AppenderRef ref="hibernate" />
79-
</Logger>
80-
8164
<Root level="fatal">
8265
<AppenderRef ref="console" />
8366
</Root>

‎logicaldoc-webapp/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@
246246
<dependency>
247247
<groupId>org.slf4j</groupId>
248248
<artifactId>slf4j-api</artifactId>
249-
</dependency>
250-
<dependency>
251-
<groupId>org.slf4j</groupId>
252-
<artifactId>slf4j-simple</artifactId>
253249
</dependency>
254250
<dependency>
255251
<groupId>org.apache.logging.log4j</groupId>
@@ -462,7 +458,13 @@
462458
<artifactId>xercesImpl</artifactId>
463459
<version>2.12.2</version>
464460
<scope>test</scope>
465-
</dependency>
461+
</dependency>
462+
<dependency>
463+
<groupId>org.apache.logging.log4j</groupId>
464+
<artifactId>log4j-slf4j-impl</artifactId>
465+
<version>2.24.3</version>
466+
<scope>test</scope>
467+
</dependency>
466468
</dependencies>
467469
<build>
468470
<plugins>

‎logicaldoc-webapp/src/test/resources/log4j2.xml‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
<Configuration packages="com.logicaldoc.util.log4j">
33
<Properties>
44
<Property name="root">target</Property>
5-
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) --
6-
%m%n</Property>
5+
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) -- %m%n</Property>
76
<Property name="dateformat">ISO8601</Property>
87
</Properties>
98

109
<Appenders>
11-
<RollingFile name="file" fileName="${root}/file.log"
12-
filePattern="${root}/file.log.%i">
10+
<RollingFile name="file" fileName="${root}/file.log" filePattern="${root}/file.log.%i">
1311
<PatternLayout>
1412
<Pattern>${pattern}</Pattern>
1513
</PatternLayout>
@@ -18,16 +16,15 @@
1816
</Policies>
1917
<DefaultRolloverStrategy max="1" />
2018
</RollingFile>
21-
<RollingFile name="hikari" fileName="${root}/hikari.log"
22-
filePattern="${root}/hikari.log.%i">
19+
<RollingFile name="hibernate" fileName="${root}/hibernate.log" filePattern="${root}/hikari.log.%i">
2320
<PatternLayout>
2421
<Pattern>${pattern}</Pattern>
2522
</PatternLayout>
2623
<Policies>
2724
<SizeBasedTriggeringPolicy size="1 MB" />
2825
</Policies>
2926
<DefaultRolloverStrategy max="1" />
30-
</RollingFile>
27+
</RollingFile>
3128

3229
<Console name="console" target="SYSTEM_OUT">
3330
<PatternLayout pattern="%m%n" />
@@ -38,46 +35,24 @@
3835
<Logger name="org.apache.cxf" level="fatal" additivity="false">
3936
<Appender-Ref ref="file" />
4037
</Logger>
41-
<Logger name="com.logicaldoc.core.searchengine" level="error"
42-
additivity="false">
43-
<Appender-Ref ref="file" />
44-
</Logger>
4538
<Logger name="com.logicaldoc" level="error" additivity="false">
4639
<Appender-Ref ref="file" />
4740
</Logger>
4841
<Logger name="com.logicaldoc.util.spring.DatabasePropertySource"
4942
level="fatal" additivity="false">
5043
<Appender-Ref ref="file" />
5144
</Logger>
52-
<Logger name="com.zaxxer.hikari" level="error" additivity="false">
53-
<AppenderRef ref="hikari" />
54-
</Logger>
5545
<Logger name="java.sql" level="error" additivity="false">
5646
<AppenderRef ref="file" />
5747
</Logger>
5848
<Logger name="org.hsqldb" level="error" additivity="false">
5949
<AppenderRef ref="file" />
6050
</Logger>
61-
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl"
62-
level="info" additivity="false">
63-
<AppenderRef ref="file" />
64-
</Logger>
65-
<Logger name="org.hsqldb" level="error" additivity="false">
66-
<AppenderRef ref="file" />
67-
</Logger>
6851

69-
<Logger name="com.logicaldoc.web.websockets" level="fatal"
70-
additivity="false">
71-
<AppenderRef ref="file" />
72-
</Logger>
73-
<Logger name="org.apache.solr" level="fatal" additivity="false">
74-
<AppenderRef ref="file" />
75-
</Logger>
76-
77-
7852
<Root level="fatal">
7953
<AppenderRef ref="console" />
8054
</Root>
8155
</Loggers>
8256

83-
</Configuration>
57+
58+
</Configuration>

‎logicaldoc-webservice/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,13 @@
286286
<groupId>org.apache.poi</groupId>
287287
<artifactId>poi-scratchpad</artifactId>
288288
<scope>test</scope>
289-
</dependency>
289+
</dependency>
290+
<dependency>
291+
<groupId>org.apache.logging.log4j</groupId>
292+
<artifactId>log4j-slf4j-impl</artifactId>
293+
<version>2.24.3</version>
294+
<scope>test</scope>
295+
</dependency>
290296
</dependencies>
291297
<build>
292298
<plugins>

0 commit comments

Comments
 (0)