This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit c1da8f0f251d7e461b812c9456274f24e2f5608b Author: Oliver Lietz <[email protected]> AuthorDate: Fri Mar 10 12:08:10 2017 +0000 add log4j-over-slf4j (workaround for OAK-5921) git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786329 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 3 ++- .../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 1 + src/main/resources/templates/SlingOptions.txt | 3 ++- src/main/resources/templates/SlingVersionResolver.txt | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java index 21482d7..e843ceb 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -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 ); } diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java index b83ac18..67e49e5 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -55,6 +55,7 @@ public class SlingVersionResolver implements VersionResolver { 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"); diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt index 5e08f65..b135f7f 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -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 ); } diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt index 1e68c13..7956e98 100644 --- a/src/main/resources/templates/SlingVersionResolver.txt +++ b/src/main/resources/templates/SlingVersionResolver.txt @@ -54,7 +54,8 @@ public class SlingVersionResolver implements VersionResolver { 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})]"); [/] } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
