Bump org.apache.logging:logging-parent from 12.0.0 to 12.1.0 in /log4j-parent (#3594)

dependabot[bot] · ppkarwasz · web-flow · commit ea71fc3444b1 · 2025-04-11T07:23:39.000+02:00
* Bump org.apache.logging:logging-parent in /log4j-parent Bumps [org.apache.logging:logging-parent](https://github.com/apache/logging-parent) from 12.0.0 to 12.1.0. - [Release notes](https://github.com/apache/logging-parent/releases) - [Commits](apache/logging-parent@rel/12.0.0...rel/12.1.0) --- updated-dependencies: - dependency-name: org.apache.logging:logging-parent dependency-version: 12.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Reformat after `palantir-java-format` upgrade * Upgrade workflows to `logging-parent` version `12.1.0` * Remove Error Prone override * Suppress Error Prone warning --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Piotr P. Karwasz <pkarwasz-github@apache.org>
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
 
   build:
     if: github.actor != 'dependabot[bot]'
-    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0
     secrets:
       DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}
     with:
@@ -44,7 +44,7 @@ jobs:
   deploy-snapshot:
     needs: build
     if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
-    uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.0
     # Secrets for deployments
     secrets:
       NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -57,7 +57,7 @@ jobs:
   deploy-release:
     needs: build
     if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
-    uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.0
     # Secrets for deployments
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -78,7 +78,7 @@ jobs:
     needs: [ deploy-snapshot, deploy-release ]
     if: ${{ always() && (needs.deploy-snapshot.result == 'success' || needs.deploy-release.result == 'success') }}
     name: "verify-reproducibility (${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.project-version || needs.deploy-snapshot.outputs.project-version }})"
-    uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.1.0
     with:
       nexus-url: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.nexus-url || 'https://repository.apache.org/content/groups/snapshots' }}
       # Encode the `runs-on` input as JSON array
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -30,7 +30,7 @@ permissions: read-all
 jobs:
 
   analyze:
-    uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.0
     with:
       java-version: |
         8
diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
@@ -33,7 +33,7 @@ jobs:
 
   deploy-site-stg:
     if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -51,7 +51,7 @@ jobs:
 
   deploy-site-pro:
     if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x-site-pro'
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -81,7 +81,7 @@ jobs:
 
   deploy-site-rel:
     needs: export-version
-    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0
     # Secrets for committing the generated site
     secrets:
       GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@ jobs:
 
   build:
     if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0
     secrets:
       DV_ACCESS_TOKEN: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     with:
@@ -42,7 +42,7 @@ jobs:
 
   merge-dependabot:
     needs: build
-    uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.0.0
+    uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.1.0
     with:
       java-version: 17
     permissions:
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java
@@ -299,12 +299,12 @@ else if (dateFormatStr.equalsIgnoreCase(AbsoluteTimeDateFormat.DATE_AND_TIME_DAT
                 // formattingInfo.dump();
                 currentLiteral.setLength(0);
                 break;
-                /*
-                 * case 'u': if(i < patternLength) { char cNext = pattern.charAt(i); if(cNext >= '0' && cNext <= '9') { pc = new
-                 * UserFieldPatternConverter(formattingInfo, cNext - '0'); LogLog.debug("USER converter ["+cNext+"].");
-                 * formattingInfo.dump(); currentLiteral.setLength(0); i++; } else LogLog.error("Unexpected char"
-                 * +cNext+" at position "+i); } break;
-                 */
+            /*
+             * case 'u': if(i < patternLength) { char cNext = pattern.charAt(i); if(cNext >= '0' && cNext <= '9') { pc = new
+             * UserFieldPatternConverter(formattingInfo, cNext - '0'); LogLog.debug("USER converter ["+cNext+"].");
+             * formattingInfo.dump(); currentLiteral.setLength(0); i++; } else LogLog.error("Unexpected char"
+             * +cNext+" at position "+i); } break;
+             */
             case 'x':
                 pc = new BasicPatternConverter(formattingInfo, NDC_CONVERTER);
                 // LogLog.debug("NDC converter.");
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -123,6 +123,7 @@ AsyncLoggerConfigDelegate getAsyncLoggerConfigDelegate() {
     }
 
     @Override
+    @SuppressWarnings("BoxedPrimitiveEquality")
     protected void log(final LogEvent event, final LoggerConfigPredicate predicate) {
         // See LOG4J2-2301
         if (predicate == LoggerConfigPredicate.ALL
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/GraalVmProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/GraalVmProcessor.java
@@ -138,17 +138,17 @@ private void processPlugin(Element element) {
                 ExecutableElement executableChild = (ExecutableElement) child;
                 if (executableChild.getModifiers().contains(Modifier.PUBLIC)) {
                     switch (executableChild.getSimpleName().toString()) {
-                            // 1. All public constructors.
+                        // 1. All public constructors.
                         case "<init>":
                             addMethod(typeElement, executableChild);
                             break;
-                            // 2. Static `newInstance` method used in, e.g. `PatternConverter` classes.
+                        // 2. Static `newInstance` method used in, e.g. `PatternConverter` classes.
                         case "newInstance":
                             if (executableChild.getModifiers().contains(Modifier.STATIC)) {
                                 addMethod(typeElement, executableChild);
                             }
                             break;
-                            // 3. Other factory methods are annotated, so we don't deal with them here.
+                        // 3. Other factory methods are annotated, so we don't deal with them here.
                         default:
                     }
                 }
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
@@ -384,16 +384,16 @@ public void run() {
                     break;
             }
             switch (result.status) {
-                    // These results cause changes in the filter
-                    // We call the listeners
+                // These results cause changes in the filter
+                // We call the listeners
                 case SUCCESS:
                 case NOT_FOUND:
                 case EMPTY:
                     for (FilterConfigUpdateListener listener : listeners) {
                         listener.onEvent();
                     }
                     break;
-                    // These results do no cause changes in the filter
+                // These results do no cause changes in the filter
                 case ERROR:
                 case NOT_MODIFIED:
                     break;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jProvider.java
@@ -127,7 +127,7 @@ private ThreadContextMap createThreadContextMap() {
             case WEB_APP_CONTEXT_MAP:
             case WEB_APP_CLASS_NAME:
                 return new DefaultThreadContextMap();
-                // Old FQCN of the garbage-free context map
+            // Old FQCN of the garbage-free context map
             case "org.apache.logging.log4j.spi.GarbageFreeSortedArrayThreadContextMap":
             case GARBAGE_FREE_CONTEXT_MAP:
             case GARBAGE_FREE_CLASS_NAME:
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java
@@ -123,7 +123,7 @@ public void stop(final BundleContext context) throws Exception {
     @Override
     public void bundleChanged(final BundleEvent event) {
         switch (event.getType()) {
-                // FIXME: STARTING instead of STARTED?
+            // FIXME: STARTING instead of STARTED?
             case BundleEvent.STARTED:
                 scanBundleForPlugins(event.getBundle());
                 break;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternDynamicFormatter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternDynamicFormatter.java
@@ -166,7 +166,7 @@ public void formatTo(final StringBuilder buffer, final Instant instant) {
 
         switch (formatters.length) {
 
-                // If found an empty pattern, return an empty formatter
+            // If found an empty pattern, return an empty formatter
             case 0:
                 return new AbstractFormatter(pattern, locale, timeZone, ChronoUnit.FOREVER) {
                     @Override
@@ -175,11 +175,11 @@ public void formatTo(final StringBuilder buffer, final Instant instant) {
                     }
                 };
 
-                // If extracted a single formatter, return it as is
+            // If extracted a single formatter, return it as is
             case 1:
                 return formatters[0];
 
-                // Profiling shows that unrolling the generic loop boosts performance
+            // Profiling shows that unrolling the generic loop boosts performance
             case 2:
                 final InstantPatternFormatter first = formatters[0];
                 final InstantPatternFormatter second = formatters[1];
@@ -192,7 +192,7 @@ public void formatTo(StringBuilder buffer, Instant instant) {
                     }
                 };
 
-                // Combine all extracted formatters into one
+            // Combine all extracted formatters into one
             default:
                 final ChronoUnit precision = Stream.of(formatters)
                         .map(InstantFormatter::getPrecision)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java
@@ -137,16 +137,16 @@ public InstantPatternFormatter build() {
             // Wrap the formatter with caching, if necessary
             switch (formatter.getPrecision()) {
 
-                    // It is not worth caching when a precision equal to or higher than microsecond is requested
+                // It is not worth caching when a precision equal to or higher than microsecond is requested
                 case NANOS:
                 case MICROS:
                     return formatter;
 
-                    // Millisecond precision cache
+                // Millisecond precision cache
                 case MILLIS:
                     return InstantPatternThreadLocalCachedFormatter.ofMilliPrecision(formatter);
 
-                    // Cache everything else with second precision
+                // Cache everything else with second precision
                 default:
                     return InstantPatternThreadLocalCachedFormatter.ofSecondPrecision(formatter);
             }
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
@@ -1001,19 +1001,6 @@
         </executions>
       </plugin>
 
-      <!-- REMOVE THIS `m-c-p` OVERRIDE with the next `logging-parent` update!
-           This is a temporary fix for the Error Prone `2.36.0` issue:
-           https://github.com/apache/logging-parent/commit/c98462c444eda72d5fe8e7a0b8112949142b7a0a -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs combine.children="append">
-            <arg>--should-stop=ifError=FLOW</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-
       <!--
         ~ Some external logging bridges can interfere with our tests, giving false negatives.
         -->
diff --git a/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULLogger.java b/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULLogger.java
@@ -75,8 +75,8 @@ public void logMessage(
     // ERROR and FATAL.
     private java.util.logging.Level convertLevel(final Level level) {
         switch (level.getStandardLevel()) {
-                // Test in logical order of likely frequency of use
-                // Must be kept in sync with #getLevel()
+            // Test in logical order of likely frequency of use
+            // Must be kept in sync with #getLevel()
             case ALL:
                 return java.util.logging.Level.ALL;
             case TRACE:
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>12.0.0</version>
+    <version>12.1.0</version>
     <relativePath />
   </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ permissions: read-all`
`30`	`30`	`jobs:`
`31`	`31`
`32`	`32`	`analyze:`
`33`		`- uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.0.0`
	`33`	`+ uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.0`
`34`	`34`	`with:`
`35`	`35`	`java-version: \|`
`36`	`36`	`8`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ AsyncLoggerConfigDelegate getAsyncLoggerConfigDelegate() {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`
	`126`	`+ @SuppressWarnings("BoxedPrimitiveEquality")`
`126`	`127`	`protected void log(final LogEvent event, final LoggerConfigPredicate predicate) {`
`127`	`128`	`// See LOG4J2-2301`
`128`	`129`	`if (predicate == LoggerConfigPredicate.ALL`