Skip to content

Commit ab813d7

Browse files
committed
Update org.apache.logging:logging-parent to version 10.4.0
- Fix Spotbugs failures - Remove `add-sbom-references.xslt` (`logging-parent` does this) - Postpone Palantir formatter (will follow in the next commit)
1 parent 6c24230 commit ab813d7

File tree

3 files changed

+1
-143
lines changed

3 files changed

+1
-143
lines changed

log4j-1.2-api/src/main/java/org/apache/log4j/Category.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import org.apache.log4j.helpers.AppenderAttachableImpl;
3232
import org.apache.log4j.helpers.NullEnumeration;
3333
import org.apache.log4j.legacy.core.CategoryUtil;
34-
import org.apache.log4j.or.ObjectRenderer;
35-
import org.apache.log4j.or.RendererMap;
3634
import org.apache.log4j.spi.AppenderAttachable;
3735
import org.apache.log4j.spi.HierarchyEventListener;
3836
import org.apache.log4j.spi.LoggerRepository;
@@ -145,8 +143,6 @@ public static void shutdown() {
145143
*/
146144
volatile protected Level level;
147145

148-
private RendererMap rendererMap;
149-
150146
/**
151147
* The parent of this category. All categories have at least one ancestor which is the root category.
152148
*/
@@ -345,21 +341,6 @@ public void forcedLog(final String fqcn, final Priority level, final Object mess
345341
}
346342
}
347343

348-
private <T> ObjectRenderer get(final Class<T> clazz) {
349-
ObjectRenderer renderer = null;
350-
for (Class<? super T> c = clazz; c != null; c = c.getSuperclass()) {
351-
renderer = rendererMap.get(c);
352-
if (renderer != null) {
353-
return renderer;
354-
}
355-
renderer = searchInterfaces(c);
356-
if (renderer != null) {
357-
return renderer;
358-
}
359-
}
360-
return null;
361-
}
362-
363344
public boolean getAdditivity() {
364345
return LogManager.isLog4jCorePresent() ? CategoryUtil.isAdditive(logger) : false;
365346
}
@@ -653,21 +634,6 @@ public void removeAppender(final String name) {
653634
}
654635
}
655636

656-
ObjectRenderer searchInterfaces(final Class<?> c) {
657-
ObjectRenderer renderer = rendererMap.get(c);
658-
if (renderer != null) {
659-
return renderer;
660-
}
661-
final Class<?>[] ia = c.getInterfaces();
662-
for (final Class<?> clazz : ia) {
663-
renderer = searchInterfaces(clazz);
664-
if (renderer != null) {
665-
return renderer;
666-
}
667-
}
668-
return null;
669-
}
670-
671637
public void setAdditivity(final boolean additivity) {
672638
if (LogManager.isLog4jCorePresent()) {
673639
CategoryUtil.setAdditivity(logger, additivity);

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.apache.logging</groupId>
3333
<artifactId>logging-parent</artifactId>
34-
<version>10.2.0</version>
34+
<version>10.4.0</version>
3535
<relativePath />
3636
</parent>
3737

src/tools/add-sbom-references.xslt

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

0 commit comments

Comments
 (0)