This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ab813d792183a06ca97659dc13a2d6cf96e332f2 Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Nov 16 11:20:08 2023 +0100 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) --- .../src/main/java/org/apache/log4j/Category.java | 34 ------- pom.xml | 2 +- src/tools/add-sbom-references.xslt | 108 --------------------- 3 files changed, 1 insertion(+), 143 deletions(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java index 54b58b56ab..42972d33d4 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java @@ -31,8 +31,6 @@ import org.apache.log4j.bridge.LogEventWrapper; import org.apache.log4j.helpers.AppenderAttachableImpl; import org.apache.log4j.helpers.NullEnumeration; import org.apache.log4j.legacy.core.CategoryUtil; -import org.apache.log4j.or.ObjectRenderer; -import org.apache.log4j.or.RendererMap; import org.apache.log4j.spi.AppenderAttachable; import org.apache.log4j.spi.HierarchyEventListener; import org.apache.log4j.spi.LoggerRepository; @@ -145,8 +143,6 @@ public class Category implements AppenderAttachable { */ volatile protected Level level; - private RendererMap rendererMap; - /** * The parent of this category. All categories have at least one ancestor which is the root category. */ @@ -345,21 +341,6 @@ public class Category implements AppenderAttachable { } } - private <T> ObjectRenderer get(final Class<T> clazz) { - ObjectRenderer renderer = null; - for (Class<? super T> c = clazz; c != null; c = c.getSuperclass()) { - renderer = rendererMap.get(c); - if (renderer != null) { - return renderer; - } - renderer = searchInterfaces(c); - if (renderer != null) { - return renderer; - } - } - return null; - } - public boolean getAdditivity() { return LogManager.isLog4jCorePresent() ? CategoryUtil.isAdditive(logger) : false; } @@ -653,21 +634,6 @@ public class Category implements AppenderAttachable { } } - ObjectRenderer searchInterfaces(final Class<?> c) { - ObjectRenderer renderer = rendererMap.get(c); - if (renderer != null) { - return renderer; - } - final Class<?>[] ia = c.getInterfaces(); - for (final Class<?> clazz : ia) { - renderer = searchInterfaces(clazz); - if (renderer != null) { - return renderer; - } - } - return null; - } - public void setAdditivity(final boolean additivity) { if (LogManager.isLog4jCorePresent()) { CategoryUtil.setAdditivity(logger, additivity); diff --git a/pom.xml b/pom.xml index 24f1be0c39..8e55ee2060 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>10.2.0</version> + <version>10.4.0</version> <relativePath /> </parent> diff --git a/src/tools/add-sbom-references.xslt b/src/tools/add-sbom-references.xslt deleted file mode 100644 index 545b0dc157..0000000000 --- a/src/tools/add-sbom-references.xslt +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache license, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the license for the specific language governing permissions and - ~ limitations under the license. - --> -<!-- - To add external references run - java -cp Xalan_bin_distribution_jars org.apache.xalan.xslt.Process \ - -IN pom.xml \ - -OUT pom.xml.out \ - -XSL this.file.xslt \ - -PARAM sbom.serialNumber e87ab1a5-3d29-48d5-82fa-211b7e913851 - -PARAM vdr.serialNumber 2496f0fa-91af-48cc-869f-ef1e03c97018 - -PARAM vdr.url https://logging.apache.org/log4j/vulnerabilities - --> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; - xmlns="http://cyclonedx.org/schema/bom/1.5"; - xmlns:xalan="http://xml.apache.org/xalan"; - xmlns:cdx14="http://cyclonedx.org/schema/bom/1.4"; - xmlns:cdx15="http://cyclonedx.org/schema/bom/1.5"; - exclude-result-prefixes="xalan cdx14 cdx15"> - <xsl:param name="sbom.serialNumber"/> - <xsl:param name="vdr.serialNumber"/> - <xsl:param name="vdr.url"/> - <xsl:output method="xml" - version="1.0" - encoding="UTF-8" - indent="yes" - xalan:indent-amount="2" - xalan:line-separator=" "/> - <!-- Fixes the license formatting --> - <xsl:template match="/"> - <xsl:text> </xsl:text> - <xsl:apply-templates /> - </xsl:template> - <!-- Standard copy template --> - <xsl:template match="@*|node()"> - <xsl:copy> - <xsl:apply-templates select="@*" /> - <xsl:apply-templates /> - </xsl:copy> - </xsl:template> - <xsl:template match="cdx14:*"> - <xsl:element name="{local-name()}" namespace="http://cyclonedx.org/schema/bom/1.5";> - <xsl:apply-templates select="@*" /> - <xsl:apply-templates /> - </xsl:element> - </xsl:template> - <!-- Main element --> - <xsl:template match="cdx14:bom"> - <bom> - <xsl:attribute name="version"> - <xsl:value-of select="1"/> - </xsl:attribute> - <xsl:attribute name="serialNumber"> - <xsl:value-of select="$sbom.serialNumber"/> - </xsl:attribute> - <xsl:apply-templates select="cdx14:metadata|cdx14:components"/> - <externalReferences> - <reference> - <xsl:attribute name="type">vulnerability-assertion</xsl:attribute> - <url> - <xsl:text>urn:cdx:</xsl:text> - <xsl:value-of select="$vdr.serialNumber"/> - </url> - </reference> - <reference> - <xsl:attribute name="type">vulnerability-assertion</xsl:attribute> - <url> - <xsl:value-of select="$vdr.url"/> - </url> - </reference> - </externalReferences> - <xsl:apply-templates select="cdx14:dependencies"/> - </bom> - </xsl:template> - <xsl:template match="cdx14:externalReferences[preceding-sibling::cdx14:group/text() = 'org.apache.logging.log4j']"> - <externalReferences> - <xsl:apply-templates/> - <reference> - <xsl:attribute name="type">vulnerability-assertion</xsl:attribute> - <url> - <xsl:text>urn:cdx:</xsl:text> - <xsl:value-of select="$vdr.serialNumber"/> - </url> - </reference> - <reference> - <xsl:attribute name="type">vulnerability-assertion</xsl:attribute> - <url> - <xsl:value-of select="$vdr.url"/> - </url> - </reference> - </externalReferences> - </xsl:template> -</xsl:stylesheet>
