Fix build failures

apache · Oct 17, 2024 · 235fcc9 · 235fcc9
1 parent 2a68530
commit 235fcc9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 33 deletions.
diff --git a/log4j-codegen/pom.xml b/log4j-codegen/pom.xml
@@ -38,30 +38,9 @@
     <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
 
     <!-- Dependencies -->
-    <log4j.version>3.0.0-SNAPSHOT</log4j.version>
     <picocli.version>4.7.5</picocli.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-bom</artifactId>
-        <version>${log4j.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>info.picocli</groupId>
-        <artifactId>picocli</artifactId>
-        <version>${picocli.version}</version>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
 
     <dependency>
@@ -90,6 +69,7 @@
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
+      <version>${picocli.version}</version>
     </dependency>
 
     <dependency>
@@ -98,12 +78,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

diff --git a/log4j-codegen/src/test/java/org/apache/logging/log4j/codegen/GenerateCustomLoggerTest.java b/log4j-codegen/src/test/java/org/apache/logging/log4j/codegen/GenerateCustomLoggerTest.java
@@ -43,7 +43,6 @@
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.codegen.Generate.LevelInfo;
 import org.apache.logging.log4j.codegen.Generate.Type;
-import org.apache.logging.log4j.core.test.TestConstants;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.test.TestLogger;
@@ -57,7 +56,7 @@
 
 @Tag("functional")
 @SetSystemProperty(
-        key = TestConstants.LOGGER_CONTEXT_FACTORY,
+        key = "log4j2.loggerContextFactory",
         value = "org.apache.logging.log4j.test.TestLoggerContextFactory")
 public class GenerateCustomLoggerTest {
 

diff --git a/log4j-codegen/src/test/java/org/apache/logging/log4j/codegen/GenerateExtendedLoggerTest.java b/log4j-codegen/src/test/java/org/apache/logging/log4j/codegen/GenerateExtendedLoggerTest.java
@@ -43,7 +43,6 @@
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.codegen.Generate.LevelInfo;
 import org.apache.logging.log4j.codegen.Generate.Type;
-import org.apache.logging.log4j.core.test.TestConstants;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.ExtendedLogger;
@@ -58,7 +57,7 @@
 
 @Tag("functional")
 @SetSystemProperty(
-        key = TestConstants.LOGGER_CONTEXT_FACTORY,
+        key = "log4j2.loggerContextFactory",
         value = "org.apache.logging.log4j.test.TestLoggerContextFactory")
 public class GenerateExtendedLoggerTest {
 

diff --git a/log4j-transform-parent/pom.xml b/log4j-transform-parent/pom.xml
@@ -38,7 +38,7 @@
     <commons-io.version>2.16.1</commons-io.version>
     <jmh.version>1.37</jmh.version>
     <junit.version>5.10.2</junit.version>
-    <log4j2.version>2.23.1</log4j2.version>
+    <log4j.version>2.24.1</log4j.version>
     <maven.version>3.9.6</maven.version>
     <plexus-utils.version>4.0.1</plexus-utils.version>
     <slf4j.version>2.0.13</slf4j.version>
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>${log4j2.version}</version>
+        <version>${log4j.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>