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:39 UTC
[sling-org-apache-sling-testing-paxexam] 01/10: SLING-9302 Remove
NoSQL Options
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() {
- }
-
-}