You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/11/22 12:11:02 UTC
(logging-log4j2) 13/13: Fix Spring-related issues
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch module-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4572a38ec501e848eb73c1a13f3672f5a489a4fa
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Nov 22 13:09:47 2023 +0100
Fix Spring-related issues
---
log4j-core-its/pom.xml | 6 -----
log4j-core-test/pom.xml | 6 -----
log4j-distribution/pom.xml | 5 ----
log4j-gctests/pom.xml | 6 -----
log4j-jdbc/pom.xml | 6 -----
log4j-jndi-test/pom.xml | 2 +-
log4j-parent/pom.xml | 27 +++-------------------
.../log4j-spring-cloud-config-client/pom.xml | 4 ----
log4j-spring-cloud-config/pom.xml | 4 +++-
9 files changed, 7 insertions(+), 59 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index c845432d19..3c13a7b914 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -159,12 +159,6 @@
<artifactId>slf4j-ext</artifactId>
<scope>test</scope>
</dependency>
- <!-- Useful mock classes and utilities -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Used for testing HttpAppender -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 1c7a197771..fde90d2614 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -279,12 +279,6 @@
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
- <!-- Useful mock classes and utilities -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.graalvm.truffle</groupId>
<artifactId>truffle-api</artifactId>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index ec471198ee..4cccca9db4 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -63,11 +63,6 @@
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter</artifactId>
- <version>${spring-cloud.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml
index 161925b38a..2272c50a03 100644
--- a/log4j-gctests/pom.xml
+++ b/log4j-gctests/pom.xml
@@ -263,12 +263,6 @@
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
- <!-- Useful mock classes and utilities -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Used for testing HTTP Watcher -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
diff --git a/log4j-jdbc/pom.xml b/log4j-jdbc/pom.xml
index 1c0b5fad8e..7335aa8e16 100644
--- a/log4j-jdbc/pom.xml
+++ b/log4j-jdbc/pom.xml
@@ -112,12 +112,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <!-- Useful mock classes and utilities -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/log4j-jndi-test/pom.xml b/log4j-jndi-test/pom.xml
index 2cf93c12e3..eaaa4d0f09 100644
--- a/log4j-jndi-test/pom.xml
+++ b/log4j-jndi-test/pom.xml
@@ -55,7 +55,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <!-- Useful mock classes and utilities -->
+ <!-- `org.springframework:spring-test` is required for `org.springframework.mock.jndi.SimpleNamingContextBuilder`: -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 9a45ab8af9..84490474b7 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -156,7 +156,6 @@
<pax-exam.version>4.13.5</pax-exam.version>
<plexus-utils.version>3.5.0</plexus-utils.version>
<slf4j.version>1.7.36</slf4j.version>
- <spring-boot.version>2.7.15</spring-boot.version>
<spring-framework.version>5.3.29</spring-framework.version>
<system-stubs.version>2.1.3</system-stubs.version>
<tomcat-juli.version>10.0.23</tomcat-juli.version>
@@ -273,14 +272,6 @@
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring-framework.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
@@ -833,21 +824,9 @@
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring-framework.version}</version>
</dependency>
<dependency>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index ff88b8866f..c2ed37b0a7 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -62,10 +62,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-boot</artifactId>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 16f6f0f71d..a02cfeaba0 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -33,8 +33,10 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring-cloud.version>2021.0.8</spring-cloud.version>
<log4jParentDir>${basedir}/..</log4jParentDir>
+ <spring-cloud.version>2021.0.8</spring-cloud.version>
+ <spring-boot.version>2.7.15</spring-boot.version>
+ <spring-framework.version>5.3.29</spring-framework.version>
</properties>
<dependencyManagement>
<dependencies>