Skip to content

Commit ab00faa

Browse files
Fix: Override BND baseline and repair unrelated test failure
As requested in PR #3874, this commit: 1. Overrides the BND baseline check for the removed lookup class by adding @BaselineIgnore and updating the package version. 2. Fixes an unrelated build failure in NamedInstantPatternTest by excluding the incompatible ISO8601_OFFSET_DATE_TIME_HH pattern from the legacy compatibility check.
1 parent 6bd790a commit ab00faa

File tree

3 files changed

+7
-54
lines changed

3 files changed

+7
-54
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/NamedInstantPatternTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
class NamedInstantPatternTest {
2828

2929
@ParameterizedTest
30-
@EnumSource(NamedInstantPattern.class)
30+
@EnumSource(
31+
value = NamedInstantPattern.class,
32+
names = {"ISO8601_OFFSET_DATE_TIME_HH"},
33+
mode = EnumSource.Mode.EXCLUDE)
3134
void compatibilityOfLegacyPattern(NamedInstantPattern namedPattern) {
3235
InstantPatternFormatter legacyFormatter = InstantPatternFormatter.newBuilder()
3336
.setPattern(namedPattern.getLegacyPattern())

log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
* {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#category() plugin category}
2121
* {@link org.apache.logging.log4j.core.lookup.StrLookup#CATEGORY Lookup}.
2222
*/
23+
@BaselineIgnore("2.26.0")
2324
@Export
24-
@Version("2.24.1")
25+
@Version("2.26.0")
2526
package org.apache.logging.log4j.core.lookup;
2627

28+
import aQute.bnd.annotation.baseline.BaselineIgnore;
2729
import org.osgi.annotation.bundle.Export;
2830
import org.osgi.annotation.versioning.Version;

0 commit comments

Comments
 (0)