You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/12 16:33:23 UTC
[logging-log4j2] branch release-2.x updated: Update dependencies.
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 00b43a8 Update dependencies.
00b43a8 is described below
commit 00b43a88072b508c0e9a390ad7c0f092853cc9db
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Nov 12 11:33:17 2020 -0500
Update dependencies.
- Update MongoDB 3 plugin: org.mongodb:mongodb-driver 3.12.6 -> 3.12.7.
- Update MongoDB 4 plugin: org.mongodb:* 4.1.0 -> 4.1.1.
- Update org.eclipse.tycho:org.eclipse.osgi 3.12.1.v20170821-1548 ->
3.13.0.v20180226-1711.
- Update de.flapdoodle.embed:de.flapdoodle.embed.mongo 2.2.0 -> 3.0.0.
---
.../logging/log4j/mongodb3/MongoDbCappedTest.java | 18 +++++++++---------
.../logging/log4j/mongodb3/MongoDbTestRule.java | 20 ++++++++------------
.../log4j/mongodb3/MongoDbTestTestRuleTest.java | 6 +++++-
.../logging/log4j/mongodb4/MongoDb4TestRule.java | 17 ++++++++---------
pom.xml | 10 +++++-----
src/changes/changes.xml | 12 ++++++++++++
6 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
index d3fe385..48d260a 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
@@ -56,14 +56,14 @@ public class MongoDbCappedTest {
public void test() {
final Logger logger = LogManager.getLogger();
logger.info("Hello log");
- try (final MongoClient mongoClient = mongoDbTestRule.getMongoClient()) {
- final MongoDatabase database = mongoClient.getDatabase("test");
- Assert.assertNotNull(database);
- final MongoCollection<Document> collection = database.getCollection("applog");
- Assert.assertNotNull(collection);
- final Document first = collection.find().first();
- Assert.assertNotNull(first);
- Assert.assertEquals(first.toJson(), "Hello log", first.getString("message"));
- }
+ @SuppressWarnings("resource") // Mongo client is managed by the test rule.
+ final MongoClient mongoClient = mongoDbTestRule.getMongoClient();
+ final MongoDatabase database = mongoClient.getDatabase("test");
+ Assert.assertNotNull(database);
+ final MongoCollection<Document> collection = database.getCollection("applog");
+ Assert.assertNotNull(collection);
+ final Document first = collection.find().first();
+ Assert.assertNotNull(first);
+ Assert.assertEquals(first.toJson(), "Hello log", first.getString("message"));
}
}
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
index b6a7097..b8c574e 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
@@ -32,12 +32,11 @@ 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.process.runtime.Network;
@@ -69,14 +68,12 @@ public class MongoDbTestRule implements TestRule {
switch (loggingTarget) {
case NULL:
final Logger logger = LoggerFactory.getLogger(MongoDbTestRule.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.getDefaultInstanceSilent()).build());
// @formatter:on
-
- return MongodStarter.getInstance(runtimeConfig);
case CONSOLE:
return MongodStarter.getDefaultInstance();
default:
@@ -129,11 +126,10 @@ public class MongoDbTestRule implements TestRule {
final int port = Integer.parseInt(value);
mongodExecutable = starter.prepare(
// @formatter:off
- new MongodConfigBuilder()
+ MongodConfig.builder()
.version(Version.Main.PRODUCTION)
.timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
- .net(
- new Net("localhost", port, Network.localhostIsIPv6()))
+ .net(new Net("localhost", port, Network.localhostIsIPv6()))
.build());
// @formatter:on
mongodProcess = mongodExecutable.start();
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
index 62812f1..8a3a4d9 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
@@ -29,6 +29,7 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.junit.rules.RuleChain;
+import com.mongodb.MongoClient;
import com.mongodb.client.MongoIterable;
/**
@@ -55,6 +56,7 @@ public class MongoDbTestTestRuleTest {
@Test
public void testAccess() {
+ @SuppressWarnings("resource") // Mongo client is managed by the test rule.
final MongoIterable<String> databaseNames = mongoDbTestRule.getMongoClient().listDatabaseNames();
Assert.assertNotNull(databaseNames);
Assert.assertNotNull(databaseNames.first());
@@ -64,7 +66,9 @@ public class MongoDbTestTestRuleTest {
public void testMongoDbTestRule() {
Assert.assertNotNull(mongoDbTestRule);
Assert.assertNotNull(mongoDbTestRule.getStarter());
- Assert.assertNotNull(mongoDbTestRule.getMongoClient());
+ @SuppressWarnings("resource") // Mongo client is managed by the test rule.
+ final MongoClient mongoClient = mongoDbTestRule.getMongoClient();
+ Assert.assertNotNull(mongoClient);
Assert.assertNotNull(mongoDbTestRule.getMongodExecutable());
Assert.assertNotNull(mongoDbTestRule.getMongodProcess());
}
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 035ef53..b3b0396 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
@@ -33,12 +33,11 @@ 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.process.runtime.Network;
@@ -70,13 +69,12 @@ 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.getDefaultInstanceSilent()).build());
// @formatter:on
-
- return MongodStarter.getInstance(runtimeConfig);
case CONSOLE:
return MongodStarter.getDefaultInstance();
default:
@@ -126,7 +124,8 @@ public class MongoDb4TestRule implements TestRule {
final int port = Integer.parseInt(value);
mongodExecutable = starter.prepare(
// @formatter:off
- new MongodConfigBuilder().version(Version.Main.PRODUCTION)
+ MongodConfig.builder()
+ .version(Version.Main.PRODUCTION)
.timeout(new Timeout(BUILDER_TIMEOUT_MILLIS))
.net(new Net("localhost", port, Network.localhostIsIPv6())).build());
// @formatter:on
diff --git a/pom.xml b/pom.xml
index 512fd06..b815296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,8 +196,8 @@
<disruptorVersion>3.4.2</disruptorVersion>
<conversantDisruptorVersion>1.2.15</conversantDisruptorVersion> <!-- Version 1.2.16 requires Java 9 -->
<elastic.version>7.6.2</elastic.version>
- <mongodb3.version>3.12.6</mongodb3.version>
- <mongodb4.version>4.1.0</mongodb4.version>
+ <mongodb3.version>3.12.7</mongodb3.version>
+ <mongodb4.version>4.1.1</mongodb4.version>
<groovy.version>3.0.6</groovy.version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<pmd.plugin.version>3.10.0</pmd.plugin.version>
@@ -243,7 +243,7 @@
<jctoolsVersion>1.2.1</jctoolsVersion>
<junitVersion>4.13.1</junitVersion>
<junitJupiterVersion>5.7.0</junitJupiterVersion>
- <mockitoVersion>2.25.1</mockitoVersion>
+ <mockitoVersion>3.6.0</mockitoVersion>
<xmlunitVersion>2.8.0</xmlunitVersion>
<argLine>-Xms256m -Xmx1024m</argLine>
<javaTargetVersion>1.8</javaTargetVersion>
@@ -291,7 +291,7 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.12.1.v20170821-1548</version>
+ <version>3.13.0.v20180226-1711</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -933,7 +933,7 @@
<!-- Testing MongoDB -->
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
- <version>2.2.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 77e7f87..7b1bfd6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -72,6 +72,18 @@
<action dev="ggregory" type="update">
Update org.codehaus.plexus:plexus-utils 3.2.0 -> 3.3.0.
</action>
+ <action dev="ggregory" type="update">
+ Update MongoDB 3 plugin: org.mongodb:mongodb-driver 3.12.6 -> 3.12.7.
+ </action>
+ <action dev="ggregory" type="update">
+ Update MongoDB 4 plugin: org.mongodb:* 4.1.0 -> 4.1.1.
+ </action>
+ <action dev="ggregory" type="update">
+ Update org.eclipse.tycho:org.eclipse.osgi 3.12.1.v20170821-1548 -> 3.13.0.v20180226-1711.
+ </action>
+ <action dev="ggregory" type="update">
+ Update de.flapdoodle.embed:de.flapdoodle.embed.mongo 2.2.0 -> 3.0.0.
+ </action>
</release>
<release version="2.14.0" date="2020-11-06" description="GA Release 2.14.0">
<action issue="LOG4J2-2925" dev="rgoers" type="fix">