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 2022/04/21 13:06:25 UTC
[sling-org-apache-sling-testing-paxexam] 01/03: SLING-11263 Provide Pax Logging API 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 9a577d2574601d906feb7169734fa483c85fe1e8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Apr 21 14:34:51 2022 +0200
SLING-11263 Provide Pax Logging API Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 6 +++
.../testing/paxexam/SlingVersionResolver.java | 2 +-
src/main/resources/templates/SlingOptions.hbs | 6 +++
.../resources/templates/SlingVersionResolver.hbs | 2 +-
.../it/tests/SlingOptionsPaxLoggingApiIT.java | 49 ++++++++++++++++++++++
5 files changed, 63 insertions(+), 2 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 91146b5..8fa3346 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -156,6 +156,12 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption paxLoggingApi() {
+ return composite(
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption paxLoggingLogback() {
return composite(
mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").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 4781e75..e1547bb 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -72,7 +72,7 @@ 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-api", "2.1.2");
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");
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 6c16b08..9884617 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -156,6 +156,12 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption paxLoggingApi() {
+ return composite(
+ mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption paxLoggingLogback() {
return composite(
mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version(versionResolver),
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index b0f58b3..cbfe180 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -72,7 +72,7 @@ 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-api", "2.1.2");
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");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxLoggingApiIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxLoggingApiIT.java
new file mode 100644
index 0000000..baf4f7a
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxLoggingApiIT.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.paxexam.it.tests;
+
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+import static org.apache.sling.testing.paxexam.SlingOptions.paxLoggingApi;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsPaxLoggingApiIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ paxLoggingApi()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}