This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push: new 3b94a483cb Remove `spring-boot-cloud-config` module as done in `main` (#1985) 3b94a483cb is described below commit 3b94a483cb78d17055713ea6facbea53703ab492 Author: Volkan Yazıcı <vol...@yazi.ci> AuthorDate: Mon Nov 27 11:32:42 2023 +0100 Remove `spring-boot-cloud-config` module as done in `main` (#1985) --- log4j-core-its/pom.xml | 11 --- log4j-core-test/pom.xml | 8 +- log4j-jakarta-web/pom.xml | 11 --- log4j-parent/pom.xml | 32 ++++++-- log4j-spring-boot/pom.xml | 10 --- .../pom.xml | 48 +++++++++++- .../cloud/config/client/Log4j2EventListener.java | 0 .../cloud/config/client/WatchEventManager.java | 0 .../spring/cloud/config/client/package-info.java | 0 ...pache.logging.log4j.core.util.WatchEventService | 0 .../src/main/resources/META-INF/spring.factories | 0 .../config/client/Log4j2EventListenerTest.java | 0 .../cloud/config/client/SpringConfiguration.java | 0 .../src/test/resources/log4j2-console.xml | 0 log4j-spring-cloud-config/pom.xml | 91 ---------------------- log4j-taglib/pom.xml | 6 -- log4j-web/pom.xml | 11 --- pom.xml | 2 +- 18 files changed, 73 insertions(+), 157 deletions(-) diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index b7fe76e189..4c780e5c4d 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -163,17 +163,6 @@ <artifactId>slf4j-api</artifactId> <scope>test</scope> </dependency> - <!-- Useful mock classes and utilities --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> <plugins> diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index f31214dbff..98d39a04d3 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -107,16 +107,10 @@ <groupId>org.junit.platform</groupId> <artifactId>junit-platform-commons</artifactId> </dependency> - <!-- Useful mock classes and utilities --> + <!-- Needed for JNDI mocks using `org.springframework.mock.jndi` --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> </dependency> <!-- JNDI and JMS tests --> <dependency> diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml index 53f302ba3d..a3f81e5146 100644 --- a/log4j-jakarta-web/pom.xml +++ b/log4j-jakarta-web/pom.xml @@ -77,17 +77,6 @@ <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index 47888d4c58..b5e765fdff 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -252,14 +252,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.apache.logging.log4j</groupId> <artifactId>log4j-api-java9</artifactId> @@ -978,6 +970,30 @@ </exclusions> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring-framework.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jcl</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring-framework.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jcl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>uk.org.webcompere</groupId> <artifactId>system-stubs-core</artifactId> diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml index f3fe115f59..79063188f7 100644 --- a/log4j-spring-boot/pom.xml +++ b/log4j-spring-boot/pom.xml @@ -52,16 +52,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config-client/pom.xml similarity index 81% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml rename to log4j-spring-cloud-config-client/pom.xml index 618f840775..12c74caca6 100644 --- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml +++ b/log4j-spring-cloud-config-client/pom.xml @@ -16,16 +16,22 @@ ~ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-cloud-config</artifactId> + <artifactId>log4j</artifactId> <version>${revision}</version> + <relativePath>../log4j-parent</relativePath> </parent> + <artifactId>log4j-spring-cloud-config-client</artifactId> <packaging>jar</packaging> + <name>Apache Log4j Spring Cloud Config Client Support</name> <description>Apache Log4j Spring Cloud Config Client Support</description> + <properties> <!-- @@ -37,61 +43,101 @@ spring.cloud.context;substitute="spring-cloud-context";static=true;transitive=false </bnd-extra-module-options> <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> + + <!-- dependency versions --> + <spring-cloud.version>2021.0.8</spring-cloud.version> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>${spring-cloud.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> + <dependency> <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> </dependency> + <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-bus</artifactId> </dependency> + <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-config-client</artifactId> </dependency> + <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-bootstrap</artifactId> </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core-test</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + </dependencies> </project> diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java b/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java rename to log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/WatchEventManager.java b/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/WatchEventManager.java similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/WatchEventManager.java rename to log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/WatchEventManager.java diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/package-info.java b/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/package-info.java similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/package-info.java rename to log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/package-info.java diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.WatchEventService b/log4j-spring-cloud-config-client/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.WatchEventService similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.WatchEventService rename to log4j-spring-cloud-config-client/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.WatchEventService diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/resources/META-INF/spring.factories b/log4j-spring-cloud-config-client/src/main/resources/META-INF/spring.factories similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/resources/META-INF/spring.factories rename to log4j-spring-cloud-config-client/src/main/resources/META-INF/spring.factories diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListenerTest.java b/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListenerTest.java similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListenerTest.java rename to log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListenerTest.java diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/SpringConfiguration.java b/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/SpringConfiguration.java similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/SpringConfiguration.java rename to log4j-spring-cloud-config-client/src/test/java/org/apache/logging/log4j/spring/cloud/config/client/SpringConfiguration.java diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/resources/log4j2-console.xml b/log4j-spring-cloud-config-client/src/test/resources/log4j2-console.xml similarity index 100% rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/test/resources/log4j2-console.xml rename to log4j-spring-cloud-config-client/src/test/resources/log4j2-console.xml diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml deleted file mode 100644 index beff2f854a..0000000000 --- a/log4j-spring-cloud-config/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to you under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> - <version>${revision}</version> - <relativePath>../log4j-parent</relativePath> - </parent> - - <artifactId>log4j-spring-cloud-config</artifactId> - <packaging>pom</packaging> - <name>Apache Log4j Spring Cloud Config Support</name> - - <modules> - <module>log4j-spring-cloud-config-client</module> - </modules> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-cloud.version>2021.0.8</spring-cloud.version> - </properties> - - <dependencyManagement> - <dependencies> - - <!-- First BOM declaring a version wins, so it must be ours: --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- Spring Boot uses an older version --> - <dependency> - <groupId>org.junit</groupId> - <artifactId>junit-bom</artifactId> - <version>${junit-jupiter.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- Overrides dependencies from `spring-boot-dependencies` and `spring-cloud-dependencies` --> - <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.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-dependencies</artifactId> - <version>${spring-cloud.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - </dependencies> - </dependencyManagement> - -</project> diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index 1ed269f65c..f34353488a 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -88,12 +88,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml index aa87d0fdfc..9e56eded6e 100644 --- a/log4j-web/pom.xml +++ b/log4j-web/pom.xml @@ -86,17 +86,6 @@ <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 6ec1c0ecbe..e81d41f111 100644 --- a/pom.xml +++ b/pom.xml @@ -265,7 +265,7 @@ <module>log4j-slf4j-impl</module> <module>log4j-slf4j2-impl</module> <module>log4j-spring-boot</module> - <module>log4j-spring-cloud-config</module> + <module>log4j-spring-cloud-config-client</module> <module>log4j-taglib</module> <module>log4j-to-slf4j</module> <module>log4j-to-jul</module>