Skip to content

Commit e157719

Browse files
committed
Move dependencies back to module
1 parent bb29376 commit e157719

File tree

2 files changed

+35
-47
lines changed

2 files changed

+35
-47
lines changed

log4j-parent/pom.xml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<pax-exam.version>4.13.5</pax-exam.version>
154154
<plexus-utils.version>3.5.1</plexus-utils.version>
155155
<slf4j.version>2.0.10</slf4j.version>
156-
<spring-boot.version>3.2.1</spring-boot.version>
157-
<spring-cloud.version>4.1.0</spring-cloud.version>
158-
<spring-framework.version>6.1.2</spring-framework.version>
159156
<system-stubs.version>2.1.5</system-stubs.version>
160157
<tomcat-juli.version>10.1.17</tomcat-juli.version>
161158
<velocity.version>1.7</velocity.version>
@@ -271,14 +268,6 @@
271268
<scope>import</scope>
272269
</dependency>
273270

274-
<dependency>
275-
<groupId>org.springframework</groupId>
276-
<artifactId>spring-framework-bom</artifactId>
277-
<version>${spring-framework.version}</version>
278-
<type>pom</type>
279-
<scope>import</scope>
280-
</dependency>
281-
282271
<dependency>
283272
<groupId>org.eclipse.angus</groupId>
284273
<artifactId>angus-activation</artifactId>
@@ -824,42 +813,6 @@
824813
<version>${slf4j.version}</version>
825814
</dependency>
826815

827-
<dependency>
828-
<groupId>org.springframework.boot</groupId>
829-
<artifactId>spring-boot-autoconfigure</artifactId>
830-
<version>${spring-boot.version}</version>
831-
</dependency>
832-
833-
<dependency>
834-
<groupId>org.springframework.boot</groupId>
835-
<artifactId>spring-boot-starter-test</artifactId>
836-
<version>${spring-boot.version}</version>
837-
<exclusions>
838-
<exclusion>
839-
<groupId>org.springframework.boot</groupId>
840-
<artifactId>spring-boot-starter-logging</artifactId>
841-
</exclusion>
842-
</exclusions>
843-
</dependency>
844-
845-
<dependency>
846-
<groupId>org.springframework</groupId>
847-
<artifactId>spring-core</artifactId>
848-
<version>${spring-framework.version}</version>
849-
<exclusions>
850-
<exclusion>
851-
<groupId>org.springframework</groupId>
852-
<artifactId>spring-jcl</artifactId>
853-
</exclusion>
854-
</exclusions>
855-
</dependency>
856-
857-
<dependency>
858-
<groupId>org.springframework.cloud</groupId>
859-
<artifactId>spring-cloud-context</artifactId>
860-
<version>${spring-cloud.version}</version>
861-
</dependency>
862-
863816
<dependency>
864817
<groupId>uk.org.webcompere</groupId>
865818
<artifactId>system-stubs-core</artifactId>

log4j-spring-cloud-config-client/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<description>Apache Log4j Spring Cloud Config Client Support</description>
3434

3535
<properties>
36+
<!-- Dependency version -->
37+
<spring-boot.version>3.2.1</spring-boot.version>
38+
<spring-cloud.version>4.1.0</spring-cloud.version>
39+
<spring-framework.version>6.1.2</spring-framework.version>
3640

3741
<!--
3842
~ OSGi and JPMS options
@@ -51,11 +55,39 @@
5155
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
5256
</properties>
5357

58+
<dependencyManagement>
59+
<dependencies>
60+
61+
<dependency>
62+
<groupId>org.springframework</groupId>
63+
<artifactId>spring-framework-bom</artifactId>
64+
<version>${spring-framework.version}</version>
65+
<type>pom</type>
66+
<scope>import</scope>
67+
</dependency>
68+
69+
<!-- We exclude external logging deps to comply with `ban-logging-dependencies` -->
70+
<dependency>
71+
<groupId>org.springframework</groupId>
72+
<artifactId>spring-core</artifactId>
73+
<version>${spring-framework.version}</version>
74+
<exclusions>
75+
<exclusion>
76+
<groupId>org.springframework</groupId>
77+
<artifactId>spring-jcl</artifactId>
78+
</exclusion>
79+
</exclusions>
80+
</dependency>
81+
82+
</dependencies>
83+
</dependencyManagement>
84+
5485
<dependencies>
5586

5687
<dependency>
5788
<groupId>org.springframework.boot</groupId>
5889
<artifactId>spring-boot-autoconfigure</artifactId>
90+
<version>${spring-boot.version}</version>
5991
<scope>provided</scope>
6092
</dependency>
6193

@@ -77,6 +109,7 @@
77109
<dependency>
78110
<groupId>org.springframework.cloud</groupId>
79111
<artifactId>spring-cloud-context</artifactId>
112+
<version>${spring-cloud.version}</version>
80113
</dependency>
81114

82115
<dependency>
@@ -85,6 +118,7 @@
85118
<scope>test</scope>
86119
</dependency>
87120

121+
<!-- Spring requires an implementation of `commons-logging` and we excluded `spring-jcl` above -->
88122
<dependency>
89123
<groupId>org.apache.logging.log4j</groupId>
90124
<artifactId>log4j-jcl</artifactId>
@@ -100,6 +134,7 @@
100134
<dependency>
101135
<groupId>org.springframework.boot</groupId>
102136
<artifactId>spring-boot-starter-test</artifactId>
137+
<version>${spring-boot.version}</version>
103138
<scope>test</scope>
104139
</dependency>
105140

0 commit comments

Comments
 (0)