Skip to content

Commit 64ce09d

Browse files
Doha2012pivovarit
authored andcommitted
remove log4j properties (eugenp#1662)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties
1 parent 76409e6 commit 64ce09d

File tree

6 files changed

+0
-63
lines changed

6 files changed

+0
-63
lines changed

aspectj/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
<artifactId>spring-aop</artifactId>
7171
<version>4.3.4.RELEASE</version>
7272
</dependency>
73-
<dependency>
74-
<groupId>log4j</groupId>
75-
<artifactId>log4j</artifactId>
76-
<version>1.2.17</version>
77-
</dependency>
7873
</dependencies>
7974

8075
<build>

aspectj/src/main/resources/log4j.properties

-10
This file was deleted.

rest-assured/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@
5959
<version>${slf4j.version}</version>
6060
</dependency>
6161

62-
<dependency>
63-
<groupId>log4j</groupId>
64-
<artifactId>log4j</artifactId>
65-
<version>${log4j.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.slf4j</groupId>
69-
<artifactId>slf4j-log4j12</artifactId>
70-
<version>${slf4j.version}</version>
71-
</dependency>
72-
7362
<dependency>
7463
<groupId>commons-logging</groupId>
7564
<artifactId>commons-logging</artifactId>
@@ -276,7 +265,6 @@
276265
<javax.mail.version>1.4.7</javax.mail.version>
277266
<jetty.version>9.4.0.v20161208</jetty.version>
278267

279-
<log4j.version>1.2.17</log4j.version>
280268
<slf4j.version>1.7.21</slf4j.version>
281269

282270
<commons-lang3.version>3.5</commons-lang3.version>

rest-assured/src/test/resources/log4j.properties

-16
This file was deleted.

xstream/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<version>${junit.version}</version>
2727
</dependency>
2828

29-
<dependency>
30-
<groupId>log4j</groupId>
31-
<artifactId>log4j</artifactId>
32-
<version>${log4j.version}</version>
33-
</dependency>
3429
</dependencies>
3530

3631
<build>
@@ -51,7 +46,6 @@
5146
<xstream.version>1.4.9</xstream.version>
5247
<jettison.version>1.3.8</jettison.version>
5348

54-
<log4j.version>1.2.17</log4j.version>
5549
<!-- testing -->
5650
<junit.version>4.12</junit.version>
5751

xstream/src/main/resources/log4j.properties

-14
This file was deleted.

0 commit comments

Comments
 (0)