This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-caconfig-mock-plugin.git
commit dcdcf5175f53c5d9867f0051befc1e7721e8d478 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Apr 25 07:47:06 2017 +0000 SLING-6789 Support CAConfig Impl 1.4.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1792579 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 ++----- .../org/apache/sling/testing/mock/caconfig/ContextPlugins.java | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 14262c4..e16af18 100644 --- a/pom.xml +++ b/pom.xml @@ -53,22 +53,19 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.caconfig.api</artifactId> - <!-- Stick with dependency version 1.1.0 as it was released with caconfig-mock-plugin 1.0.0 --> <version>1.1.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.caconfig.spi</artifactId> - <!-- Stick with dependency version 1.2.0 as it was released with caconfig-mock-plugin 1.0.0 --> - <version>1.2.0</version> + <version>1.3.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.caconfig.impl</artifactId> - <!-- Stick with dependency version 1.2.0 as it was released with caconfig-mock-plugin 1.0.0 --> - <version>1.2.0</version> + <version>1.3.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java index 0f14346..4197bff 100644 --- a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java +++ b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java @@ -104,6 +104,7 @@ public final class ContextPlugins { * @param context Sling context */ private static void registerConfigurationResolver(SlingContextImpl context) { + registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationManagementSettingsImpl"); if (!registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexerImpl")) { // fallback to impl 1.2 -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
