You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/04/25 07:47:07 UTC
svn commit: r1792579 - in /sling/trunk/testing/mocks/caconfig-mock-plugin: pom.xml src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java

Author: sseifert
Date: Tue Apr 25 07:47:06 2017
New Revision: 1792579

URL: http://svn.apache.org/viewvc?rev=1792579&view=rev
Log:
SLING-6789 Support CAConfig Impl 1.4.0

Modified:
    sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml
    sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java

Modified: sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml?rev=1792579&r1=1792578&r2=1792579&view=diff
==============================================================================
--- sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml (original)
+++ sling/trunk/testing/mocks/caconfig-mock-plugin/pom.xml Tue Apr 25 07:47:06 2017
@@ -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>

Modified: sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java?rev=1792579&r1=1792578&r2=1792579&view=diff
==============================================================================
--- sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java (original)
+++ sling/trunk/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java Tue Apr 25 07:47:06 2017
@@ -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