Skip to content

Clean up log4j-spring-cloud-config-client dependencies #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Clean up log4j-spring-cloud-config-client dependencies #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c2b80a
Clean up `log4j-spring-cloud-config-client` dependencies
ppkarwasz Jan 4, 2024
8bbc085
Move dependencies back to module
ppkarwasz Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 47 additions & 44 deletions log4j-spring-cloud-config-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,50 +33,48 @@
<description>Apache Log4j Spring Cloud Config Client Support</description>

<properties>
<!-- Dependency version -->
<spring-boot.version>3.2.1</spring-boot.version>
<spring-cloud.version>4.1.0</spring-cloud.version>
<spring-framework.version>6.1.2</spring-framework.version>

<!--
~ OSGi and JPMS options
-->
<bnd-module-name>org.apache.logging.log4j.spring.cloud.config.client</bnd-module-name>
<bnd-extra-packages-options>
<!-- Used only for annotations -->
org.springframework.boot.autoconfigure;resolution:=optional
</bnd-extra-packages-options>
<bnd-extra-module-options>
<!-- Optional dependencies should not be transitive -->
spring.boot.autoconfigure;transitive=false,
<!-- Filebased module names: MUST be static -->
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-boot.version>3.2.1</spring-boot.version>
<spring-cloud.version>2022.0.4</spring-cloud.version>

</properties>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- We exclude external logging deps to comply with `ban-logging-dependencies` -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring-framework.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -86,67 +84,72 @@

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>

<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.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<artifactId>spring-cloud-context</artifactId>
<version>${spring-cloud.version}</version>
</dependency>

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core-test</artifactId>
<scope>test</scope>
</dependency>

<!-- Spring requires an implementation of `commons-logging` and we excluded `spring-jcl` above -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core-test</artifactId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Spring requires bridges from all logging APIs and we excluded `spring-boot-starter-logging` above -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
Expand Down
10 changes: 10 additions & 0 deletions src/changelog/.3.x.x/fix_spring_cloud_config_client_deps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="2157" link="https://github.com/apache/logging-log4j2/pull/2157"/>
<description format="asciidoc">
Fix `log4j-spring-cloud-config-client` dependencies to include only those required.
</description>
</entry>