From dd89427e703142701776241594795d63adb556b0 Mon Sep 17 00:00:00 2001
From: Michael Mosmann <michael@mosmann.de>
Date: Tue, 10 Mar 2015 08:59:27 +0100
Subject: [PATCH] mongo version upgrade
---
Changelog.md | 3 +++
.../embed/mongo/distribution/Version.java | 14 +++++++++----
src/test/resources/simplelogger.properties | 21 +++++++++++++++++++
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index bc79ad1..d9f4aa7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
#### 1.46.5 (SNAPSHOT)
+- changed logging to slf4j
+- mongo version upgrade (2.6.8, 3.0.0)
+
#### 1.46.4
- Implement equals and hashCode on GenericFeatureAwareVersion so that CachingArtifactStore can work. Version is a component of Distribution, which is used as the cache key of CachingArtifactStore
diff --git a/src/main/java/de/flapdoodle/embed/mongo/distribution/Version.java b/src/main/java/de/flapdoodle/embed/mongo/distribution/Version.java
index aa30780..64cb8d5 100644
--- a/src/main/java/de/flapdoodle/embed/mongo/distribution/Version.java
+++ b/src/main/java/de/flapdoodle/embed/mongo/distribution/Version.java
@@ -127,22 +127,26 @@ public enum Version implements IFeatureAwareVersion {
*/
@Deprecated
V2_6_0("2.6.0",Feature.SYNC_DELAY),
+ @Deprecated
+ V2_6_1("2.6.1",Feature.SYNC_DELAY),
/**
* Latest 2.6 production release
*/
- V2_6_1("2.6.1",Feature.SYNC_DELAY),
+ V2_6_8("2.6.8",Feature.SYNC_DELAY),
/**
* Latest 2.7 series development release
*/
@Deprecated
V2_7_0("2.7.0",Feature.SYNC_DELAY),
+ @Deprecated
+ V2_7_1("2.7.1",Feature.SYNC_DELAY),
/**
* Latest 2.7 series development release
*/
- V2_7_1("2.7.1",Feature.SYNC_DELAY),
+ V3_0_0("3.0.0",Feature.SYNC_DELAY),
;
@@ -186,15 +190,17 @@ public enum Version implements IFeatureAwareVersion {
/**
* Latest production release
*/
- V2_6(V2_6_1),
+ V2_6(V2_6_8),
/**
* Latest development release
*/
+ @Deprecated
V2_7(V2_7_1),
+ V3_0(V3_0_0),
PRODUCTION(V2_6),
- DEVELOPMENT(V2_7), ;
+ DEVELOPMENT(V3_0), ;
private final IFeatureAwareVersion _latest;
diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties
index e0f0d79..acc5a78 100644
--- a/src/test/resources/simplelogger.properties
+++ b/src/test/resources/simplelogger.properties
@@ -1 +1,22 @@
+#
+# Copyright (C) 2011
+# Michael Mosmann <michael@mosmann.de>
+# Martin Jöhren <m.joehren@googlemail.com>
+#
+# with contributions from
+# konstantin-ba@github,Archimedes Trajano (trajano@github)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
org.slf4j.simpleLogger.defaultLogLevel=trace
--
GitLab