diff --git a/Changelog.md b/Changelog.md index bc79ad1fa6fa7cfd911f532f933fac5f177182d0..d9f4aa7cd664070c2794715811582b3dffa74bfc 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 aa307806dc03817a07c90db74c77ca31f904f27c..64cb8d54e0394449235c0aa4682cc94e64a23477 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 e0f0d79df7a7b4b3781a64c543d4dd99f7e0af4f..acc5a78783cc676638e09d390b6202a2aee7546e 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