You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/06/15 23:19:59 UTC
[sling-org-apache-sling-testing-paxexam] 02/04: SLING-10492 Provide
Pax Logging Logback Option
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 845dd1a5ec7dbe65efaa78d4035e5cc2568c8564
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jun 16 00:36:07 2021 +0200
SLING-10492 Provide Pax Logging Logback Option
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 7 +++++++
.../org/apache/sling/testing/paxexam/SlingVersionResolver.java | 2 ++
src/main/resources/templates/SlingOptions.hbs | 7 +++++++
src/main/resources/templates/SlingVersionResolver.hbs | 2 ++
4 files changed, 18 insertions(+)
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 837f429..e1ca031 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -155,6 +155,13 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption paxLoggingLogback() {
+ return composite(
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-logback").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption paxUrl() {
return composite(
mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-commons").version(versionResolver),
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 c6db89a..10b3961 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -71,6 +71,8 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.ops4j.base:ops4j-base-monitors", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-store", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1");
+ versions.put("org.ops4j.pax.logging:pax-logging-api", "2.0.9");
+ versions.put("org.ops4j.pax.logging:pax-logging-logback", "2.0.9");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.2");
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index b097757..1a0abb3 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -155,6 +155,13 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption paxLoggingLogback() {
+ return composite(
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-logback").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption paxUrl() {
return composite(
mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-commons").version(versionResolver),
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 8eb8e72..65a4df8 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -71,6 +71,8 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.ops4j.base:ops4j-base-monitors", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-store", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1");
+ versions.put("org.ops4j.pax.logging:pax-logging-api", "2.0.9");
+ versions.put("org.ops4j.pax.logging:pax-logging-logback", "2.0.9");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.2");