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 10351e6cba9d3e9f15084ffeba59fc47f1a1912a Author: Oliver Lietz <[email protected]> AuthorDate: Sun Mar 4 13:59:16 2018 +0100 SLING-7530 Remove Launchpad Content Option --- pom.xml | 2 +- .../apache/sling/testing/paxexam/SlingOptions.java | 9 ---- .../testing/paxexam/SlingVersionResolver.java | 1 - .../apache/sling/testing/paxexam/package-info.java | 2 +- .../tests/SlingOptionsSlingLaunchpadContentIT.java | 48 ---------------------- 5 files changed, 2 insertions(+), 60 deletions(-) diff --git a/pom.xml b/pom.xml index 41bbc14..34edb2e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ </parent> <artifactId>org.apache.sling.testing.paxexam</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Apache Sling Testing PaxExam</name> <description>Test support for use with Pax Exam.</description> 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 a44e849..45088a6 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -604,15 +604,6 @@ public class SlingOptions { ); } - public static Option slingLaunchpadContent() { - return composite( - sling(), - slingAuthForm(), - composum(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.content").version(versionResolver) - ); - } - public static Option slingNosqlGeneric() { 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 8ee2187..081e108 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -182,7 +182,6 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.sling:org.apache.sling.jcr.webconsole", "1.0.2"); versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.8"); versions.put("org.apache.sling:org.apache.sling.jmx.provider", "1.0.2"); - versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.12"); versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.6"); versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.6"); versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8"); 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 3cbb5fa..0d44b0e 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("2.0.0") +@Version("3.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/SlingOptionsSlingLaunchpadContentIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java deleted file mode 100644 index f4efadc..0000000 --- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java +++ /dev/null @@ -1,48 +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.slingLaunchpadContent; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class SlingOptionsSlingLaunchpadContentIT extends SlingOptionsTestSupport { - - @Configuration - public Option[] configuration() { - return new Option[]{ - baseConfiguration(), - slingLaunchpadContent() - }; - } - - @Test - public void test() { - } - -} -- To stop receiving notification emails like this one, please contact [email protected].
