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 2020/04/01 06:40:38 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(c6d22a7 -> 6eb521d)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
from c6d22a7 [maven-release-plugin] prepare for next development iteration
new 8be6a6b SLING-9302 Remove NoSQL Options
new 906fa26 SLING-9308 Remove Threaddump Option
new f4bbf4f SLING-9309 Rename Option slingScriptingSightly to slingScriptingHtl
new ed1b8e3 SLING-9310 Rename Option composum to composumNodes
new b30aecf SLING-9311 Provide Thymeleaf Option
new 3d30a33 SLING-9303 Provide Commons Crypto Option
new e34c6fc SLING-9310 Rename Option composum to composumNodes
new 62b3e89 SLING-9300 Provide Commons OSGi Option
new a05f633 SLING-9304 Provide Commons Messaging Option
new 6eb521d SLING-9305 Provide Commons Messaging Mail Option
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sling/testing/paxexam/SlingOptions.java | 122 +++++++++------------
.../testing/paxexam/SlingVersionResolver.java | 10 +-
.../apache/sling/testing/paxexam/package-info.java | 2 +-
...sumIT.java => SlingOptionsComposumNodesIT.java} | 6 +-
....java => SlingOptionsSlingCommonsCryptoIT.java} | 6 +-
...va => SlingOptionsSlingCommonsMessagingIT.java} | 6 +-
...> SlingOptionsSlingCommonsMessagingMailIT.java} | 6 +-
...IT.java => SlingOptionsSlingCommonsOsgiIT.java} | 6 +-
.../tests/SlingOptionsSlingNosqlCouchbaseIT.java | 49 ---------
.../it/tests/SlingOptionsSlingNosqlMongodbIT.java | 49 ---------
...lingOptionsSlingQuickstartNosqlCouchbaseIT.java | 49 ---------
.../SlingOptionsSlingQuickstartNosqlMongodbIT.java | 49 ---------
...T.java => SlingOptionsSlingScriptingHtlIT.java} | 6 +-
...ingClamIT.java => SlingOptionsThymeleafIT.java} | 6 +-
14 files changed, 79 insertions(+), 293 deletions(-)
rename src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsComposumIT.java => SlingOptionsComposumNodesIT.java} (93%)
copy src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingQuickstartOakIT.java => SlingOptionsSlingCommonsCryptoIT.java} (93%)
rename src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingScriptingSightlyIT.java => SlingOptionsSlingCommonsMessagingIT.java} (93%)
rename src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingExtensionsThreaddumpIT.java => SlingOptionsSlingCommonsMessagingMailIT.java} (92%)
copy src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingCommonsHtmlIT.java => SlingOptionsSlingCommonsOsgiIT.java} (93%)
delete mode 100644 src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
delete mode 100644 src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
delete mode 100644 src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
delete mode 100644 src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
rename src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingNosqlGenericIT.java => SlingOptionsSlingScriptingHtlIT.java} (93%)
copy src/test/java/org/apache/sling/testing/paxexam/it/tests/{SlingOptionsSlingClamIT.java => SlingOptionsThymeleafIT.java} (90%)
[sling-org-apache-sling-testing-paxexam] 07/10: SLING-9310 Rename
Option composum to composumNodes
Posted by ol...@apache.org.
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 e34c6fcd52c69fb336425024cddc63e0e826f19e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 11:33:37 2020 +0200
SLING-9310 Rename Option composum to composumNodes
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 49262ee..0d48d3b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -922,7 +922,7 @@ public class SlingOptions {
return composite(
sling(),
slingAuthForm(),
- composum(),
+ composumNodes(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.starter.content").version(versionResolver)
);
}
[sling-org-apache-sling-testing-paxexam] 02/10: SLING-9308 Remove
Threaddump Option
Posted by ol...@apache.org.
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 906fa26f8108c602f6118e5be36f67f4e5756153
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 07:47:21 2020 +0200
SLING-9308 Remove Threaddump Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 6 ---
.../testing/paxexam/SlingVersionResolver.java | 1 -
.../SlingOptionsSlingExtensionsThreaddumpIT.java | 49 ----------------------
3 files changed, 56 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 6d41b3b..109a21d 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -562,12 +562,6 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption slingExtensionsThreaddump() {
- return composite(
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.extensions.threaddump").version(versionResolver)
- );
- }
-
public static ModifiableCompositeOption slingUrlrewriter() {
return composite(
sling(),
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 3cb4d5d..38a6b98 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -191,7 +191,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.engine", "2.6.18");
versions.put("org.apache.sling:org.apache.sling.event", "4.2.12");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.4");
- versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.14");
versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.4");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java
deleted file mode 100644
index 110a707..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingExtensionsThreaddump;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionsThreaddumpIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingExtensionsThreaddump()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
[sling-org-apache-sling-testing-paxexam] 04/10: SLING-9310 Rename
Option composum to composumNodes
Posted by ol...@apache.org.
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 ed1b8e38bdce4d1d26976b58ce16a8e6a310d7dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 09:51:15 2020 +0200
SLING-9310 Rename Option composum to composumNodes
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 4 ++--
...SlingOptionsComposumIT.java => SlingOptionsComposumNodesIT.java} | 6 +++---
2 files changed, 5 insertions(+), 5 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 d919ba7..6f49115 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -1005,7 +1005,7 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption composum() {
+ public static ModifiableCompositeOption composumNodes() {
return composite(
sling(),
slingJcr(),
@@ -1020,7 +1020,7 @@ public class SlingOptions {
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-package-manager").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment")
.put("whitelist.bundles", new String[]{"com.composum.core.commons", "com.composum.core.pckgmgr"})
- .put("whitelist.name", "composum")
+ .put("whitelist.name", "composum-nodes")
.asOption()
);
}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
index 877e00e..a4d21fc 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
@@ -27,18 +27,18 @@ 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.composum;
+import static org.apache.sling.testing.paxexam.SlingOptions.composumNodes;
import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsComposumIT extends SlingOptionsTestSupport {
+public class SlingOptionsComposumNodesIT extends SlingOptionsTestSupport {
@Configuration
public Option[] configuration() {
return options(
baseConfiguration(),
- composum()
+ composumNodes()
);
}
[sling-org-apache-sling-testing-paxexam] 09/10: SLING-9304 Provide
Commons Messaging Option
Posted by ol...@apache.org.
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 a05f633c7a2116a28f38cee87c8edf5c51010ac4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 12:31:41 2020 +0200
SLING-9304 Provide Commons Messaging Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 6 +++
.../testing/paxexam/SlingVersionResolver.java | 1 +
.../tests/SlingOptionsSlingCommonsMessagingIT.java | 49 ++++++++++++++++++++++
3 files changed, 56 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 e72de4e..73a648e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -299,6 +299,12 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption slingCommonsMessaging() {
+ return composite(
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption slingCommonsMetrics() {
return composite(
scr(),
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 1c4368e..b4affc5 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -179,6 +179,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.6");
versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.2.0");
+ versions.put("org.apache.sling:org.apache.sling.commons.messaging", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.2");
versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.18");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingIT.java
new file mode 100644
index 0000000..1fa80bc
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingIT.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.slingCommonsMessaging;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSlingCommonsMessagingIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ slingCommonsMessaging()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}
[sling-org-apache-sling-testing-paxexam] 06/10: SLING-9303 Provide
Commons Crypto Option
Posted by ol...@apache.org.
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 3d30a33d2afd982052cab66cefe8656f6b42f89a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 11:28:20 2020 +0200
SLING-9303 Provide Commons Crypto Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 9 ++++
.../testing/paxexam/SlingVersionResolver.java | 2 +
.../it/tests/SlingOptionsSlingCommonsCryptoIT.java | 49 ++++++++++++++++++++++
3 files changed, 60 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 9985769..49262ee 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -270,6 +270,15 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption slingCommonsCrypto() {
+ return composite(
+ scr(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.crypto").version(versionResolver),
+ mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jasypt").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption slingCommonsFsclassloader() {
return composite(
scr(),
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 38a6b98..1c4368e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -156,6 +156,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.pdfbox:fontbox", "2.0.15");
versions.put("org.apache.pdfbox:jempbox", "1.8.16");
versions.put("org.apache.pdfbox:pdfbox", "2.0.15");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jasypt", "1.9.3_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.1_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.10_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf", "3.0.11.RELEASE_1");
@@ -173,6 +174,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.4");
versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.6");
versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.10");
+ versions.put("org.apache.sling:org.apache.sling.commons.crypto", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.6");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCryptoIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCryptoIT.java
new file mode 100644
index 0000000..52b3f96
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCryptoIT.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.slingCommonsCrypto;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSlingCommonsCryptoIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ slingCommonsCrypto()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}
[sling-org-apache-sling-testing-paxexam] 03/10: SLING-9309 Rename
Option slingScriptingSightly to slingScriptingHtl
Posted by ol...@apache.org.
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 f4bbf4f53f86808b0216eaf8efd383141d5a30c2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 08:54:44 2020 +0200
SLING-9309 Rename Option slingScriptingSightly to slingScriptingHtl
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +-
...ScriptingSightlyIT.java => SlingOptionsSlingScriptingHtlIT.java} | 6 +++---
2 files changed, 4 insertions(+), 4 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 109a21d..d919ba7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -858,7 +858,7 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption slingScriptingSightly() {
+ public static ModifiableCompositeOption slingScriptingHtl() {
return composite(
sling(),
slingJcr(),
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingHtlIT.java
similarity index 91%
rename from src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingHtlIT.java
index f9dd10d..2be6e9a 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingHtlIT.java
@@ -27,18 +27,18 @@ 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.slingScriptingSightly;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingScriptingHtl;
import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingScriptingSightlyIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingScriptingHtlIT extends SlingOptionsTestSupport {
@Configuration
public Option[] configuration() {
return options(
baseConfiguration(),
- slingScriptingSightly()
+ slingScriptingHtl()
);
}
[sling-org-apache-sling-testing-paxexam] 01/10: SLING-9302 Remove
NoSQL Options
Posted by ol...@apache.org.
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 8be6a6b8bf38ce02a8b3a0522029f990381610e9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 07:12:02 2020 +0200
SLING-9302 Remove NoSQL Options
---
.../apache/sling/testing/paxexam/SlingOptions.java | 51 ----------------------
.../testing/paxexam/SlingVersionResolver.java | 5 ---
.../apache/sling/testing/paxexam/package-info.java | 2 +-
.../tests/SlingOptionsSlingNosqlCouchbaseIT.java | 49 ---------------------
.../it/tests/SlingOptionsSlingNosqlGenericIT.java | 49 ---------------------
.../it/tests/SlingOptionsSlingNosqlMongodbIT.java | 49 ---------------------
...lingOptionsSlingQuickstartNosqlCouchbaseIT.java | 49 ---------------------
.../SlingOptionsSlingQuickstartNosqlMongodbIT.java | 49 ---------------------
8 files changed, 1 insertion(+), 302 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 c7f5d6a..6d41b3b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -708,57 +708,6 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption slingNosqlGeneric() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.generic").version(versionResolver)
- );
- }
-
- public static ModifiableCompositeOption slingNosqlCouchbase() {
- return composite(
- slingNosqlGeneric(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-client").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-resourceprovider").version(versionResolver),
- mavenBundle().groupId("io.wcm.osgi.wrapper").artifactId("io.wcm.osgi.wrapper.rxjava").version(versionResolver)
- );
- }
-
- public static ModifiableCompositeOption slingNosqlMongodb() {
- return composite(
- slingNosqlGeneric(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.mongodb-resourceprovider").version(versionResolver),
- mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver)
- );
- }
-
- public static ModifiableCompositeOption slingQuickstartNosqlCouchbase() {
- return composite(
- slingNosqlCouchbase(),
- factoryConfiguration("org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config")
- .put("provider.roots", new String[]{"/"})
- .asOption(),
- factoryConfiguration("org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config")
- .put("bucketName", "sling")
- .put("clientId", "sling-resourceprovider-couchbase")
- .put("couchbaseHosts", "localhost:8091")
- .put("enabled", true)
- .asOption()
- );
- }
-
- public static ModifiableCompositeOption slingQuickstartNosqlMongodb() {
- return composite(
- slingNosqlMongodb(),
- factoryConfiguration("org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config")
- .put("collection", "resources")
- .put("connectionString", "localhost:27017")
- .put("database", "sling")
- .put("provider.roots", new String[]{"/"})
- .asOption()
- );
- }
-
public static ModifiableCompositeOption slingQuickstartOak() {
return composite(
webconsole(),
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 f596715..3cb4d5d 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -106,7 +106,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("commons-io:commons-io", "2.6");
versions.put("commons-lang:commons-lang", "2.6");
versions.put("io.dropwizard.metrics:metrics-core", "3.2.6");
- versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.3.8-0000");
versions.put("javax.jcr:jcr", "2.0");
versions.put("javax.mail:javax.mail-api", "1.6.2");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
@@ -220,10 +219,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.8");
versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.10");
versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8");
- versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-client", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-resourceprovider", "1.1.0");
- versions.put("org.apache.sling:org.apache.sling.nosql.generic", "1.1.0");
- versions.put("org.apache.sling:org.apache.sling.nosql.mongodb-resourceprovider", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.pipes", "3.1.0");
versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
versions.put("org.apache.sling:org.apache.sling.query", "4.0.2");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/package-info.java b/src/main/java/org/apache/sling/testing/paxexam/package-info.java
index e9f9d1f..efc98d7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/package-info.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("4.1.0")
+@Version("5.0.0")
package org.apache.sling.testing.paxexam;
import org.osgi.annotation.versioning.Version;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
deleted file mode 100644
index 43d775e..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingNosqlCouchbase;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingNosqlCouchbaseIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingNosqlCouchbase()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java
deleted file mode 100644
index e8e6a6d..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingNosqlGeneric;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingNosqlGenericIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingNosqlGeneric()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
deleted file mode 100644
index 2a3e231..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingNosqlMongodb;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingNosqlMongodbIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingNosqlMongodb()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
deleted file mode 100644
index feffa8b..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingQuickstartNosqlCouchbase;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingQuickstartNosqlCouchbaseIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingQuickstartNosqlCouchbase()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
deleted file mode 100644
index a776245..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.slingQuickstartNosqlMongodb;
-import static org.ops4j.pax.exam.CoreOptions.options;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingQuickstartNosqlMongodbIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return options(
- baseConfiguration(),
- slingQuickstartNosqlMongodb()
- );
- }
-
- @Test
- public void test() {
- }
-
-}
[sling-org-apache-sling-testing-paxexam] 05/10: SLING-9311 Provide
Thymeleaf Option
Posted by ol...@apache.org.
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 b30aecfcb4f4fd065e6297b618e8ba012104d4b9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 11:20:13 2020 +0200
SLING-9311 Provide Thymeleaf Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 16 ++++---
.../paxexam/it/tests/SlingOptionsThymeleafIT.java | 49 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 5 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 6f49115..9985769 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -884,15 +884,11 @@ public class SlingOptions {
public static ModifiableCompositeOption slingScriptingThymeleaf() {
return composite(
+ thymeleaf(),
sling(),
slingScripting(),
slingI18n(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
- mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.thymeleaf").version(versionResolver),
- mavenBundle().groupId("org.attoparser").artifactId("attoparser").version(versionResolver),
- mavenBundle().groupId("org.unbescape").artifactId("unbescape").version(versionResolver),
- mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ognl").version(versionResolver),
- mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.scripting.thymeleaf=sling-scripting"})
.asOption()
@@ -1025,6 +1021,16 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption thymeleaf() {
+ return composite(
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.thymeleaf").version(versionResolver),
+ mavenBundle().groupId("org.attoparser").artifactId("attoparser").version(versionResolver),
+ mavenBundle().groupId("org.unbescape").artifactId("unbescape").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ognl").version(versionResolver),
+ mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption slingQuickstartOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsThymeleafIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsThymeleafIT.java
new file mode 100644
index 0000000..d9f0b86
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsThymeleafIT.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.thymeleaf;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsThymeleafIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ thymeleaf()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}
[sling-org-apache-sling-testing-paxexam] 08/10: SLING-9300 Provide
Commons OSGi Option
Posted by ol...@apache.org.
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 62b3e891ef5c1d4fbe0aaa1d38133db85a081903
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 12:28:44 2020 +0200
SLING-9300 Provide Commons OSGi Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 13 ++++--
.../it/tests/SlingOptionsSlingCommonsOsgiIT.java | 49 ++++++++++++++++++++++
2 files changed, 59 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 0d48d3b..e72de4e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -215,6 +215,7 @@ public class SlingOptions {
http(),
httpWhiteboard(),
slingCommonsFsclassloader(),
+ slingCommonsOsgi(),
slingCommonsScheduler(),
slingCommonsThreads(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.api").version(versionResolver),
@@ -225,7 +226,6 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.settings").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.johnzon").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.mime").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
mavenBundle().groupId("commons-codec").artifactId("commons-codec").version(versionResolver),
mavenBundle().groupId("commons-collections").artifactId("commons-collections").version(versionResolver),
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
@@ -284,8 +284,8 @@ public class SlingOptions {
scr(),
webconsole(),
slingCommonsClassloader(),
+ slingCommonsOsgi(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.fsclassloader").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver)
);
@@ -295,7 +295,7 @@ public class SlingOptions {
return composite(
scr(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver)
+ slingCommonsOsgi()
);
}
@@ -307,6 +307,13 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption slingCommonsOsgi() {
+ return composite(
+ eventadmin(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption slingCommonsScheduler() {
return composite(
scr(),
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsOsgiIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsOsgiIT.java
new file mode 100644
index 0000000..6675904
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsOsgiIT.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.slingCommonsOsgi;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSlingCommonsOsgiIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ slingCommonsOsgi()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}
[sling-org-apache-sling-testing-paxexam] 10/10: SLING-9305 Provide
Commons Messaging Mail Option
Posted by ol...@apache.org.
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 6eb521dc8ac47f9d0a575f817598db342029032a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 12:39:19 2020 +0200
SLING-9305 Provide Commons Messaging Mail Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 13 ++++++
.../testing/paxexam/SlingVersionResolver.java | 1 +
.../SlingOptionsSlingCommonsMessagingMailIT.java | 49 ++++++++++++++++++++++
3 files changed, 63 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 73a648e..5c01a8a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -305,6 +305,19 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption slingCommonsMessagingMail() {
+ return composite(
+ scr(),
+ slingCommonsCrypto(),
+ slingCommonsMessaging(),
+ slingCommonsThreads(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging.mail").version(versionResolver),
+ mavenBundle().groupId("com.sun.mail").artifactId("javax.mail").version(versionResolver),
+ mavenBundle().groupId("javax.mail").artifactId("javax.mail-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption slingCommonsMetrics() {
return composite(
scr(),
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 b4affc5..e104b4f 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -180,6 +180,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.6");
versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.2.0");
versions.put("org.apache.sling:org.apache.sling.commons.messaging", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.commons.messaging.mail", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.2");
versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.18");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingMailIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingMailIT.java
new file mode 100644
index 0000000..abe61b8
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMessagingMailIT.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.slingCommonsMessagingMail;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSlingCommonsMessagingMailIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ slingCommonsMessagingMail()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}