You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2022/10/16 23:50:03 UTC
[logging-log4j2] branch master updated: Bump `embedded-mongo.version` to 3.5.0
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 44a2f88bb5 Bump `embedded-mongo.version` to 3.5.0
44a2f88bb5 is described below
commit 44a2f88bb5099bcca43609e6b21c90bc4c032552
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Oct 17 01:31:47 2022 +0200
Bump `embedded-mongo.version` to 3.5.0
This synchronizes the dependency version with `release-2.x`.
---
.../logging/log4j/mongodb3/MongoDb3TestRule.java | 48 +++++++++-------------
.../logging/log4j/mongodb4/MongoDb4TestRule.java | 43 ++++++++-----------
pom.xml | 2 +-
3 files changed, 38 insertions(+), 55 deletions(-)
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
index 3b7e5edcc3..d8727d3cc8 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.mongodb3;
import java.util.Objects;
import org.apache.commons.lang3.NotImplementedException;
-import org.junit.AssumptionViolatedException;
+import org.apache.logging.log4j.core.util.Integers;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -29,17 +29,15 @@ import org.slf4j.LoggerFactory;
import com.mongodb.MongoClient;
-import de.flapdoodle.embed.mongo.Command;
import de.flapdoodle.embed.mongo.MongodExecutable;
import de.flapdoodle.embed.mongo.MongodProcess;
import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Defaults;
+import de.flapdoodle.embed.mongo.config.MongodConfig;
import de.flapdoodle.embed.mongo.config.Net;
-import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
import de.flapdoodle.embed.mongo.config.Timeout;
import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.config.IRuntimeConfig;
-import de.flapdoodle.embed.process.config.io.ProcessOutput;
+import de.flapdoodle.embed.mongo.packageresolver.Command;
import de.flapdoodle.embed.process.runtime.Network;
/**
@@ -70,14 +68,13 @@ public class MongoDb3TestRule implements TestRule {
switch (loggingTarget) {
case NULL:
final Logger logger = LoggerFactory.getLogger(MongoDb3TestRule.class.getName());
- final IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
// @formatter:off
- .defaultsWithLogger(Command.MongoD, logger)
- .processOutput(ProcessOutput.getDefaultInstanceSilent())
- .build();
+ return MongodStarter.getInstance(
+ Defaults
+ .runtimeConfigFor(Command.MongoD, logger)
+ //.processOutput(ProcessOutput.builder().build())
+ .build());
// @formatter:on
-
- return MongodStarter.getInstance(runtimeConfig);
case CONSOLE:
return MongodStarter.getDefaultInstance();
default:
@@ -127,22 +124,15 @@ public class MongoDb3TestRule implements TestRule {
public void evaluate() throws Throwable {
final String value = Objects.requireNonNull(System.getProperty(portSystemPropertyName),
"System property '" + portSystemPropertyName + "' is null");
- final int port = Integer.parseInt(value);
- try {
- mongodExecutable = starter.prepare(
- // @formatter:off
- new MongodConfigBuilder()
- .version(Version.Main.PRODUCTION)
- .timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
- .net(
- new Net("localhost", port, Network.localhostIsIPv6()))
- .build());
- // @formatter:on
- } catch (final IllegalArgumentException e) {
- if (e.getMessage().contains("this version does not support 32Bit")) {
- throw new AssumptionViolatedException("Unsupported platform: " + e.getMessage());
- }
- }
+ final int port = Integers.parseInt(value);
+ mongodExecutable = starter.prepare(
+ // @formatter:off
+ MongodConfig.builder()
+ .version(Version.Main.PRODUCTION)
+ .timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
+ .net(new Net("localhost", port, Network.localhostIsIPv6()))
+ .build());
+ // @formatter:on
mongodProcess = mongodExecutable.start();
mongoClient = new MongoClient("localhost", port);
try {
@@ -179,7 +169,7 @@ public class MongoDb3TestRule implements TestRule {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("MongoDbTestRule [starter=");
builder.append(starter);
builder.append(", portSystemPropertyName=");
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestRule.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestRule.java
index 0b6e8607ed..782929302c 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestRule.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestRule.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.mongodb4;
import java.util.Objects;
import org.apache.commons.lang3.NotImplementedException;
-import org.junit.AssumptionViolatedException;
+import org.apache.logging.log4j.core.util.Integers;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -30,17 +30,15 @@ import org.slf4j.LoggerFactory;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
-import de.flapdoodle.embed.mongo.Command;
import de.flapdoodle.embed.mongo.MongodExecutable;
import de.flapdoodle.embed.mongo.MongodProcess;
import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Defaults;
+import de.flapdoodle.embed.mongo.config.MongodConfig;
import de.flapdoodle.embed.mongo.config.Net;
-import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
import de.flapdoodle.embed.mongo.config.Timeout;
import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.config.IRuntimeConfig;
-import de.flapdoodle.embed.process.config.io.ProcessOutput;
+import de.flapdoodle.embed.mongo.packageresolver.Command;
import de.flapdoodle.embed.process.runtime.Network;
/**
@@ -71,13 +69,13 @@ public class MongoDb4TestRule implements TestRule {
switch (loggingTarget) {
case NULL:
final Logger logger = LoggerFactory.getLogger(MongoDb4TestRule.class.getName());
- final IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
// @formatter:off
- .defaultsWithLogger(Command.MongoD, logger).processOutput(ProcessOutput.getDefaultInstanceSilent())
- .build();
+ return MongodStarter.getInstance(
+ Defaults
+ .runtimeConfigFor(Command.MongoD, logger)
+ //.processOutput(ProcessOutput.builder().build())
+ .build());
// @formatter:on
-
- return MongodStarter.getInstance(runtimeConfig);
case CONSOLE:
return MongodStarter.getDefaultInstance();
default:
@@ -124,19 +122,14 @@ public class MongoDb4TestRule implements TestRule {
public void evaluate() throws Throwable {
final String value = Objects.requireNonNull(System.getProperty(portSystemPropertyName),
"System property '" + portSystemPropertyName + "' is null");
- final int port = Integer.parseInt(value);
- try {
- mongodExecutable = starter.prepare(
- // @formatter:off
- new MongodConfigBuilder().version(Version.Main.PRODUCTION)
- .timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
- .net(new Net("localhost", port, Network.localhostIsIPv6())).build());
- // @formatter:on
- } catch (final IllegalArgumentException e) {
- if (e.getMessage().contains("this version does not support 32Bit")) {
- throw new AssumptionViolatedException("Unsupported platform: " + e.getMessage());
- }
- }
+ final int port = Integers.parseInt(value);
+ mongodExecutable = starter.prepare(
+ // @formatter:off
+ MongodConfig.builder()
+ .version(Version.Main.PRODUCTION)
+ .timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
+ .net(new Net("localhost", port, Network.localhostIsIPv6())).build());
+ // @formatter:on
mongodProcess = mongodExecutable.start();
mongoClient = MongoClients.create("mongodb://localhost:" + port);
try {
@@ -190,4 +183,4 @@ public class MongoDb4TestRule implements TestRule {
return builder.toString();
}
-}
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 52b9313b64..4ca44a4f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,7 +296,7 @@
<disruptor.version>3.4.4</disruptor.version>
<elasticsearch.version>7.17.6</elasticsearch.version>
<embedded-ldap.version>0.8.1</embedded-ldap.version>
- <embedded-mongo.version>2.2.0</embedded-mongo.version>
+ <embedded-mongo.version>3.5.0</embedded-mongo.version>
<errorprone.version>2.7.1</errorprone.version>
<felix.version>7.0.5</felix.version>
<flume.version>1.10.1</flume.version>