This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 788ec715a4c9c9a259f615d6e7809344a4a480f2 Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Jan 10 12:59:53 2024 +0100 Port `log4j-docker` changes from `2.x` --- log4j-docker/pom.xml | 3 +-- .../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml index 8d4369b438..890688836e 100644 --- a/log4j-docker/pom.xml +++ b/log4j-docker/pom.xml @@ -23,13 +23,11 @@ <version>${revision}</version> <relativePath>../log4j-parent</relativePath> </parent> - <artifactId>log4j-docker</artifactId> <packaging>jar</packaging> <name>Apache Log4j Docker Library</name> <description>Apache Log4j Docker Support</description> <properties> - <log4jParentDir>${basedir}/..</log4jParentDir> <!-- ~ OSGi and JPMS options @@ -89,4 +87,5 @@ </plugins> </build> + </project> diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java index 98b2dc779f..c4ffb31ea8 100644 --- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java +++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java @@ -63,7 +63,6 @@ public class DockerLookup extends AbstractLookup { Container current = null; try { final URL url = new URL(baseUri + "/containers/json"); - if (url.getProtocol().equals(HTTP)) { final String macAddr = NetUtils.getMacAddressString(); final ObjectMapper objectMapper = new ObjectMapper();
