diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3e5377d03c1..e9c52a05d72 100644 --- 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 index 05a37e02f99..be664031951 100644 --- 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 index 604ac5f63aa..e9ab08d8ad8 100644 --- 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 index cfb0b1d63dd..3690740ba65 100644 --- 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 index 8e01c07e78e..2f51657a3e2 100644 --- 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 index 092206f01e7..e51eb82731d 100644 --- 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 index 18b29beec01..3b1f9bd5cb6 100644 --- 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 "": 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 index b9061fe0158..62ef3a596e0 100644 --- 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,8 +384,8 @@ 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: @@ -393,7 +393,7 @@ public void run() { 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 index 9c3a05dabf7..ffcdb2e643a 100644 --- 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 index 4fae66de228..53f3f2c609a 100644 --- 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 index 1c9dfab5711..4bd34168771 100644 --- 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 index 0ec8598ce9e..e3fab77e188 100644 --- 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 index 6afc9d8b069..9493306e161 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -991,19 +991,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - --should-stop=ifError=FLOW - - - - 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 index 11081071574..14928de3d8d 100644 --- 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 index ffef4829c8a..bce5e5cc036 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.logging logging-parent - 12.0.0 + 12.1.0