This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new ed6495e5a2 Replace `wiremock` with `wiremock-jre8`
ed6495e5a2 is described below
commit ed6495e5a2fb9a9c586a401ea5f13ee5ed3a8541
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Sep 27 22:57:52 2022 +0200
Replace `wiremock` with `wiremock-jre8`
Replacing the EOL `wiremock` artifact with `wiremock-jre8` allows us to
bump the version.
---
log4j-core-its/pom.xml | 2 +-
.../apache/logging/log4j/core/appender/HttpAppenderTest.java | 10 ++++++----
log4j-core-test/pom.xml | 2 +-
.../java/org/apache/logging/log4j/core/util/WatchHttpTest.java | 9 +++++----
log4j-gctests/pom.xml | 2 +-
pom.xml | 5 +++--
6 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index eff9b73682..6d806ed938 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -208,7 +208,7 @@
<!-- Used for testing HttpAppender -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-jre8</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
index 9a3cf7b217..1cd9f78d7b 100644
---
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
+++
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
@@ -152,10 +152,12 @@ public class HttpAppenderTest {
public LoggerContextRule ctx = new
LoggerContextRule("HttpAppenderTest.xml");
@Rule
- public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort().dynamicHttpsPort()
- .keystorePath(TestConstants.KEYSTORE_FILE)
- .keystorePassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
- .keystoreType(TestConstants.KEYSTORE_TYPE));
+ public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort()
+ .dynamicHttpsPort()
+ .keystorePath(TestConstants.KEYSTORE_FILE)
+ .keystorePassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
+ .keyManagerPassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
+ .keystoreType(TestConstants.KEYSTORE_TYPE));
@Test
public void testAppend() throws Exception {
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 018e38f0d7..cf16e158ac 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -296,7 +296,7 @@
<!-- Used for testing HTTP Watcher -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-jre8</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
index a8af9859b2..cd73ef6d60 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
@@ -84,11 +84,12 @@ public class WatchHttpTest {
public static StatusLoggerRule RULE = new StatusLoggerRule(Level.OFF);
@Rule
- public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort().dynamicHttpsPort()
- .keystorePath(TestConstants.KEYSTORE_FILE)
- .keystorePassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
+ public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort()
+ .dynamicHttpsPort()
+ .keystorePath(TestConstants.KEYSTORE_FILE)
+ .keystorePassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
.keyManagerPassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
- .keystoreType(TestConstants.KEYSTORE_TYPE));
+ .keystoreType(TestConstants.KEYSTORE_TYPE));
@Test
public void testWatchManager() throws Exception {
diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml
index 4ed81311f8..af4a50a4da 100644
--- a/log4j-gctests/pom.xml
+++ b/log4j-gctests/pom.xml
@@ -298,7 +298,7 @@
<!-- Used for testing HTTP Watcher -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-jre8</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9f54d0677d..794b9b1fb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,7 @@
<javaTargetVersion>11</javaTargetVersion>
<module.name/>
<netty-all.version>4.1.72.Final</netty-all.version>
+ <wiremock.version>2.34.0</wiremock.version>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -909,8 +910,8 @@
<!-- Used for testing HttpAppender -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
- <version>2.27.2</version>
+ <artifactId>wiremock-jre8</artifactId>
+ <version>${wiremock.version}</version>
<exclusions>
<exclusion>
<groupId>com.github.jknack</groupId>
