This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new dd231a8 [LOG4J2-2763] Update dependencies.
dd231a8 is described below
commit dd231a8ae3eccb79710ebd6c5877dfa4cde3ba04
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Jan 20 19:57:40 2020 -0500
[LOG4J2-2763] Update dependencies.
* wiremock 2.19.0 -> 2.25.1
* Update test from @Ignore to JUnit Assume.
---
.../apache/logging/log4j/core/appender/HttpAppenderTest.java | 11 ++++++++---
pom.xml | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
index ad83d5b..3d3fb87 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
@@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
+import org.apache.commons.lang3.SystemUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Layout;
@@ -48,15 +49,14 @@ import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.status.StatusData;
import org.apache.logging.log4j.status.StatusListener;
import org.apache.logging.log4j.status.StatusLogger;
-import org.junit.Ignore;
+import org.junit.Assume;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
-@Ignore("Fails often on Windows")
-
/* Fails often on Windows, for example:
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-surefire-plugin:2.20.1:test (default-test) on
project log4j-core: There are test failures.
[ERROR]
@@ -131,6 +131,11 @@ public class HttpAppenderTest {
private static final String LOG_MESSAGE = "Hello, world!";
+ @BeforeClass
+ public static void setupClass() {
+ Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS);
+ }
+
private static Log4jLogEvent createLogEvent() {
return Log4jLogEvent.newBuilder()
.setLoggerName(HttpAppenderTest.class.getName())
diff --git a/pom.xml b/pom.xml
index 2cd9ac1..ef208f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -810,7 +810,7 @@
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<scope>test</scope>
- <version>2.19.0</version>
+ <version>2.25.1</version>
</dependency>
<!-- Used for compressing to formats other than zip and gz -->
<dependency>
