This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch parent-10.1.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git
commit 7013ecfa591539b0711d0f4d35839339b00496aa Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Oct 2 21:42:15 2023 +0200 Try fixing tests --- log4j-transform-maven-plugin/src/it/location/pom.xml | 2 +- log4j-transform-maven-plugin/src/it/pomproject/pom.xml | 2 +- log4j-transform-maven-shade-plugin-extensions/pom.xml | 4 ---- .../log4j/weaver/AbstractConversionHandlerTest.java | 15 +++++++++++---- .../weaver/log4j2/LoggerConversionHandlerExample.java | 3 +-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/log4j-transform-maven-plugin/src/it/location/pom.xml b/log4j-transform-maven-plugin/src/it/location/pom.xml index 801c04d..6602b51 100644 --- a/log4j-transform-maven-plugin/src/it/location/pom.xml +++ b/log4j-transform-maven-plugin/src/it/location/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>10.0.0</version> + <version>10.1.1</version> <relativePath /> </parent> diff --git a/log4j-transform-maven-plugin/src/it/pomproject/pom.xml b/log4j-transform-maven-plugin/src/it/pomproject/pom.xml index 71f9f8e..225459d 100644 --- a/log4j-transform-maven-plugin/src/it/pomproject/pom.xml +++ b/log4j-transform-maven-plugin/src/it/pomproject/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>10.0.0</version> + <version>10.1.1</version> <relativePath /> </parent> diff --git a/log4j-transform-maven-shade-plugin-extensions/pom.xml b/log4j-transform-maven-shade-plugin-extensions/pom.xml index 26bf911..64fb904 100644 --- a/log4j-transform-maven-shade-plugin-extensions/pom.xml +++ b/log4j-transform-maven-shade-plugin-extensions/pom.xml @@ -32,10 +32,6 @@ <name>Apache Log4j Maven Shade Plugin Transformer</name> <description>Transformer implementation to concatenate Log4j2Plugins.dat files</description> - <properties> - <bnd.skip>true</bnd.skip> - </properties> - <dependencies> <dependency> diff --git a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/AbstractConversionHandlerTest.java b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/AbstractConversionHandlerTest.java index 1517184..1dbde3b 100644 --- a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/AbstractConversionHandlerTest.java +++ b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/AbstractConversionHandlerTest.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.stream.Collectors; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -51,11 +52,17 @@ public class AbstractConversionHandlerTest { .get(AbstractConversionHandlerTest.class.getClassLoader().getResource(internalName + ".class").toURI()); final String simpleClassName = Paths.get(internalName).getFileName().toString(); try (Stream<Path> paths = Files.walk(topClass.getParent(), 1)) { - return paths.filter(p -> { - final String nested = p.getFileName().toString(); - return nested.startsWith(simpleClassName) && nested.endsWith(".class"); - }).sorted(); + return paths + .filter(p -> { + final String nested = p.getFileName().toString(); + return nested.startsWith(simpleClassName) && nested.endsWith(".class"); + }) + .sorted() + // We create a shallow-copy to return a `Stream` without leaking file descriptors + .collect(Collectors.toList()) + .stream(); } + } private static class TestClassLoader extends ClassLoader { diff --git a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java index 8405fce..812d97c 100644 --- a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java +++ b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java @@ -55,8 +55,7 @@ public class LoggerConversionHandlerExample { private static final Object P9 = "(p9)"; private static final Object[] PARRAY = { "(...)" }; private static final Supplier<?>[] SUPPLIERS = { () -> OBJECT }; - @SuppressWarnings("StaticAssignmentOfThrowable") - private static final Throwable THROWABLE = new RuntimeException(); + @SuppressWarnings("StaticAssignmentOfThrowable") private static final Throwable THROWABLE = new RuntimeException(); private static final Marker MARKER = MarkerManager.getMarker("MARKER"); private static final Logger logger = LogManager.getLogger();
