This is much nicer, thanks! — Matt Sicker
> On May 29, 2022, at 03:05, rgo...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > rgoers pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git > > commit b6f289eed925efc9a53e34a70edad8d298245c05 > Author: Ralph Goers <rgo...@apache.org> > AuthorDate: Sun May 29 01:04:14 2022 -0700 > > LOG4J2-3511 - Use the bom/pom.xml > --- > log4j-bom/pom.xml | 31 +++++ > log4j-spring-boot/pom.xml | 11 ++ > .../log4j-spring-cloud-config-client/pom.xml | 11 ++ > pom.xml | 134 ++------------------- > 4 files changed, 65 insertions(+), 122 deletions(-) > > diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml > index 85d170331e..e2e3cbc341 100644 > --- a/log4j-bom/pom.xml > +++ b/log4j-bom/pom.xml > @@ -55,18 +55,38 @@ > <artifactId>log4j-api</artifactId> > <version>${project.version}</version> > </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-api-test</artifactId> > + <version>${project.version}</version> > + </dependency> > <!-- Plugins --> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > <artifactId>log4j-plugins</artifactId> > <version>${project.version}</version> > </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-plugin-processor</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-plugins-test</artifactId> > + <version>${project.version}</version> > + </dependency> > <!-- Core Log4j --> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > <artifactId>log4j-core</artifactId> > <version>${project.version}</version> > </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-core-test</artifactId> > + <version>${project.version}</version> > + </dependency> > <!-- Commons code for Jackson-based layouts --> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > @@ -121,6 +141,17 @@ > <artifactId>log4j-jdbc-dbcp2</artifactId> > <version>${project.version}</version> > </dependency> > + <!-- JNDI --> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-jndi</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-jndi-test</artifactId> > + <version>${project.version}</version> > + </dependency> > <!-- Apache Flume Bridge --> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml > index 172857e84d..e1e1b3be28 100644 > --- a/log4j-spring-boot/pom.xml > +++ b/log4j-spring-boot/pom.xml > @@ -35,6 +35,13 @@ > </properties> > <dependencyManagement> > <dependencies> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-bom</artifactId> > + <version>${project.version}</version> > + <scope>import</scope> > + <type>pom</type> > + </dependency> > <dependency> > <groupId>org.springframework</groupId> > <artifactId>spring-framework-bom</artifactId> > @@ -95,6 +102,10 @@ > <groupId>org.apache.logging.log4j</groupId> > <artifactId>log4j-core</artifactId> > </dependency> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-plugins</artifactId> > + </dependency> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > <artifactId>log4j-core-test</artifactId> > 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 f1410cf5a0..cc416783e9 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 > @@ -32,6 +32,17 @@ > <projectDir>/log4j-spring-cloud-config-client</projectDir> > > <module.name>org.apache.logging.log4j.spring.cloud.config.client</module.name> > </properties> > + <dependencyManagement> > + <dependencies> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-bom</artifactId> > + <version>${project.version}</version> > + <scope>import</scope> > + <type>pom</type> > + </dependency> > + </dependencies> > + </dependencyManagement> > <dependencies> > <dependency> > <groupId>org.apache.logging.log4j</groupId> > diff --git a/pom.xml b/pom.xml > index f5c78ac70b..6e9db7f0b5 100644 > --- a/pom.xml > +++ b/pom.xml > @@ -308,6 +308,13 @@ > </pluginRepositories> > <dependencyManagement> > <dependencies> > + <dependency> > + <groupId>org.apache.logging.log4j</groupId> > + <artifactId>log4j-bom</artifactId> > + <version>${project.version}</version> > + <scope>import</scope> > + <type>pom</type> > + </dependency> > <dependency> > <groupId>org.slf4j</groupId> > <artifactId>slf4j-api</artifactId> > @@ -356,6 +363,11 @@ > <artifactId>commons-lang3</artifactId> > <version>3.12.0</version> > </dependency> > + <dependency> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging</artifactId> > + <version>${commonsLoggingVersion}</version> > + </dependency> > <dependency> > <groupId>ch.qos.logback</groupId> > <artifactId>logback-classic</artifactId> > @@ -369,128 +381,6 @@ > <type>test-jar</type> > <scope>test</scope> > </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-api-test</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-api</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-plugins</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-plugin-processor</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-1.2-api</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-plugins-test</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jndi-test</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-layout-template-json</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-core</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-core-test</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-layout-template-json</artifactId> > - <version>${project.version}</version> > - <type>test-jar</type> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-slf4j-impl</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-slf4j-impl</artifactId> > - <version>${project.version}</version> > - <type>zip</type> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-slf4j18-impl</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jcl</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>commons-logging</groupId> > - <artifactId>commons-logging</artifactId> > - <version>${commonsLoggingVersion}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-flume-ng</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-iostreams</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jndi</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jul</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jpl</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-taglib</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-web</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.logging.log4j</groupId> > - <artifactId>log4j-jakarta-web</artifactId> > - <version>${project.version}</version> > - </dependency> > <dependency> > <groupId>com.sleepycat</groupId> > <artifactId>je</artifactId> >
