svn commit: r1786329 - in /sling/trunk/testing/org.apache.sling.testing.paxexam/src/main: java/org/apache/sling/testing/paxexam/ resources/templates/

[olli]

Author: olli
Date: Fri Mar 10 12:08:10 2017
New Revision: 1786329

URL: http://svn.apache.org/viewvc?rev=1786329&view=rev
Log:
add log4j-over-slf4j (workaround for OAK-5921)

Modified:
    
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
    
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
    
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
    
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1786329&r1=1786328&r2=1786329&view=diff
==============================================================================
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
 Fri Mar 10 12:08:10 2017
@@ -872,7 +872,8 @@ public class SlingOptions {
                 .asOption(),
             
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
                 .put("localIndexDir", localIndexDir)
-                .asOption()
+                .asOption(),
+            
mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver)
 // OAK-5921
         );
     }
 

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1786329&r1=1786328&r2=1786329&view=diff
==============================================================================
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
 Fri Mar 10 12:08:10 2017
@@ -55,6 +55,7 @@ public class SlingVersionResolver implem
         versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.2");
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
         versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
+        versions.put("org.slf4j:log4j-over-slf4j", "1.7.24");
         versions.put("com.composum.sling.core:composum-sling-core-commons", 
"1.7.0");
         versions.put("com.composum.sling.core:composum-sling-core-console", 
"1.7.0");
         versions.put("com.composum.sling.core:composum-sling-core-jslibs", 
"1.7.0");

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1786329&r1=1786328&r2=1786329&view=diff
==============================================================================
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
 Fri Mar 10 12:08:10 2017
@@ -133,7 +133,8 @@ public class SlingOptions {
                 .asOption(),
             
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
                 .put("localIndexDir", localIndexDir)
-                .asOption()
+                .asOption(),
+            
mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver)
 // OAK-5921
         );
     }
 

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt?rev=1786329&r1=1786328&r2=1786329&view=diff
==============================================================================
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
 Fri Mar 10 12:08:10 2017
@@ -54,7 +54,8 @@ public class SlingVersionResolver implem
         versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
         versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.2");
         versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
-        versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");[# 
th:each="bundle : ${bundles}"]
+        versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
+        versions.put("org.slf4j:log4j-over-slf4j", "1.7.24");[# 
th:each="bundle : ${bundles}"]
         versions.put("[(${bundle.groupId})]:[(${bundle.artifactId})]", 
"[(${bundle.version})]");
 [/]    }