Skip to content

Commit 93e0883

Browse files
cortleppcortlepp
authored
Merge pull request #23 from apache/cortlepp/unify-log4j-deps
chore: unify log4j deps and update them
2 parents 43d0528 + 8f5b196 commit 93e0883

6 files changed

Lines changed: 14 additions & 46 deletions

File tree

‎modules/distribution/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,14 @@
139139
<dependency>
140140
<groupId>org.apache.logging.log4j</groupId>
141141
<artifactId>log4j-bom</artifactId>
142-
<version>2.24.1</version>
142+
<version>${log4j.version}</version>
143143
<type>pom</type>
144144
<scope>import</scope>
145145
</dependency>
146146
<!-- Log4j2 Commons Logging bridge - replaces commons-logging -->
147147
<dependency>
148148
<groupId>org.apache.logging.log4j</groupId>
149149
<artifactId>log4j-jcl</artifactId>
150-
<version>2.18.0</version>
151150
<exclusions>
152151
<exclusion>
153152
<groupId>commons-logging</groupId>
@@ -159,7 +158,6 @@
159158
<dependency>
160159
<groupId>org.apache.logging.log4j</groupId>
161160
<artifactId>log4j-slf4j-impl</artifactId>
162-
<version>2.18.0</version>
163161
<exclusions>
164162
<exclusion>
165163
<groupId>org.slf4j</groupId>
@@ -171,12 +169,10 @@
171169
<dependency>
172170
<groupId>org.apache.logging.log4j</groupId>
173171
<artifactId>log4j-core</artifactId>
174-
<version>2.18.0</version>
175172
</dependency>
176173
<dependency>
177174
<groupId>org.apache.logging.log4j</groupId>
178175
<artifactId>log4j-api</artifactId>
179-
<version>2.18.0</version>
180176
</dependency>
181177
</dependencies>
182178

‎modules/rampart-integration/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,25 +582,21 @@
582582
<groupId>junit</groupId>
583583
<artifactId>junit</artifactId>
584584
</dependency>
585-
<dependency>
585+
<dependency>
586586
<groupId>org.apache.logging.log4j</groupId>
587587
<artifactId>log4j-jul</artifactId>
588-
<version>2.24.1</version>
589588
</dependency>
590589
<dependency>
591590
<groupId>org.apache.logging.log4j</groupId>
592591
<artifactId>log4j-core</artifactId>
593-
<version>2.24.1</version>
594592
</dependency>
595593
<dependency>
596594
<groupId>org.apache.logging.log4j</groupId>
597595
<artifactId>log4j-api</artifactId>
598-
<version>2.24.1</version>
599596
</dependency>
600-
<dependency>
597+
<dependency>
601598
<groupId>org.apache.logging.log4j</groupId>
602599
<artifactId>log4j-jcl</artifactId>
603-
<version>2.24.1</version>
604600
</dependency>
605601
<dependency>
606602
<groupId>org.apache.axis2</groupId>

‎modules/rampart-samples/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,28 +111,24 @@
111111
<version>1.10.15</version>
112112
<scope>test</scope>
113113
</dependency>
114-
<dependency>
114+
<dependency>
115115
<groupId>org.apache.logging.log4j</groupId>
116116
<artifactId>log4j-jul</artifactId>
117-
<version>2.24.1</version>
118117
<scope>test</scope>
119118
</dependency>
120119
<dependency>
121120
<groupId>org.apache.logging.log4j</groupId>
122121
<artifactId>log4j-core</artifactId>
123-
<version>2.24.1</version>
124122
<scope>test</scope>
125123
</dependency>
126124
<dependency>
127125
<groupId>org.apache.logging.log4j</groupId>
128126
<artifactId>log4j-api</artifactId>
129-
<version>2.24.1</version>
130127
<scope>test</scope>
131128
</dependency>
132-
<dependency>
129+
<dependency>
133130
<groupId>org.apache.logging.log4j</groupId>
134131
<artifactId>log4j-jcl</artifactId>
135-
<version>2.24.1</version>
136132
<scope>test</scope>
137133
</dependency>
138134
<dependency>

‎modules/rampart-tests/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,28 +108,24 @@
108108
<version>${project.version}</version>
109109
<scope>test</scope>
110110
</dependency>
111-
<dependency>
111+
<dependency>
112112
<groupId>org.apache.logging.log4j</groupId>
113113
<artifactId>log4j-jul</artifactId>
114-
<version>2.24.1</version>
115114
<scope>test</scope>
116115
</dependency>
117116
<dependency>
118117
<groupId>org.apache.logging.log4j</groupId>
119118
<artifactId>log4j-core</artifactId>
120-
<version>2.24.1</version>
121119
<scope>test</scope>
122120
</dependency>
123121
<dependency>
124122
<groupId>org.apache.logging.log4j</groupId>
125123
<artifactId>log4j-api</artifactId>
126-
<version>2.24.1</version>
127124
<scope>test</scope>
128125
</dependency>
129-
<dependency>
126+
<dependency>
130127
<groupId>org.apache.logging.log4j</groupId>
131128
<artifactId>log4j-jcl</artifactId>
132-
<version>2.24.1</version>
133129
<scope>test</scope>
134130
</dependency>
135131
<dependency>

‎modules/rampart-trust/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,28 +101,24 @@
101101
<artifactId>junit</artifactId>
102102
<scope>test</scope>
103103
</dependency>
104-
<dependency>
104+
<dependency>
105105
<groupId>org.apache.logging.log4j</groupId>
106106
<artifactId>log4j-jul</artifactId>
107-
<version>2.24.1</version>
108107
<scope>test</scope>
109108
</dependency>
110109
<dependency>
111110
<groupId>org.apache.logging.log4j</groupId>
112111
<artifactId>log4j-core</artifactId>
113-
<version>2.24.1</version>
114112
<scope>test</scope>
115113
</dependency>
116114
<dependency>
117115
<groupId>org.apache.logging.log4j</groupId>
118116
<artifactId>log4j-api</artifactId>
119-
<version>2.24.1</version>
120117
<scope>test</scope>
121118
</dependency>
122-
<dependency>
119+
<dependency>
123120
<groupId>org.apache.logging.log4j</groupId>
124121
<artifactId>log4j-jcl</artifactId>
125-
<version>2.24.1</version>
126122
<scope>test</scope>
127123
</dependency>
128124
</dependencies>

‎pom.xml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -696,23 +696,10 @@
696696
</dependency>
697697
<dependency>
698698
<groupId>org.apache.logging.log4j</groupId>
699-
<artifactId>log4j-jul</artifactId>
700-
<version>2.24.1</version>
701-
</dependency>
702-
<dependency>
703-
<groupId>org.apache.logging.log4j</groupId>
704-
<artifactId>log4j-core</artifactId>
705-
<version>2.24.1</version>
706-
</dependency>
707-
<dependency>
708-
<groupId>org.apache.logging.log4j</groupId>
709-
<artifactId>log4j-api</artifactId>
710-
<version>2.24.1</version>
711-
</dependency>
712-
<dependency>
713-
<groupId>org.apache.logging.log4j</groupId>
714-
<artifactId>log4j-jcl</artifactId>
715-
<version>2.24.1</version>
699+
<artifactId>log4j-bom</artifactId>
700+
<version>${log4j.version}</version>
701+
<type>pom</type>
702+
<scope>import</scope>
716703
</dependency>
717704
<dependency>
718705
<groupId>org.slf4j</groupId>
@@ -857,6 +844,7 @@
857844

858845
<jacoco.version>0.8.12</jacoco.version>
859846
<slf4j.version>2.0.16</slf4j.version>
847+
<log4j.version>2.25.4</log4j.version>
860848
<!-- see the parent artifact 'apache' i.e 33, it defaults to a older version-->
861849
<maven.compiler.target>11</maven.compiler.target>
862850
</properties>

0 commit comments

Comments
 (0)