This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 143930cda2c89d9de39b6f4d89c74e1b10c4e021 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Aug 16 15:31:30 2016 +0000 SLING-5970 switch to osgi annotations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1756527 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/testing/mock/sling/builder/package-info.java | 2 +- .../org/apache/sling/testing/mock/sling/context/SlingContextImpl.java | 3 +-- .../java/org/apache/sling/testing/mock/sling/context/package-info.java | 2 +- .../java/org/apache/sling/testing/mock/sling/junit/package-info.java | 2 +- .../java/org/apache/sling/testing/mock/sling/loader/package-info.java | 2 +- src/main/java/org/apache/sling/testing/mock/sling/package-info.java | 2 +- .../org/apache/sling/testing/mock/sling/services/package-info.java | 2 +- .../java/org/apache/sling/testing/mock/sling/servlet/package-info.java | 2 +- .../java/org/apache/sling/testing/mock/sling/spi/package-info.java | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java index 987a862..942005f 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java @@ -19,5 +19,5 @@ /** * Content builder for creating test content. */ [email protected]("1.0") [email protected]("1.0") package org.apache.sling.testing.mock.sling.builder; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java index aceb506..60733ca 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java @@ -57,6 +57,7 @@ import org.apache.sling.testing.mock.sling.services.MockSlingSettingService; import org.apache.sling.testing.mock.sling.servlet.MockRequestPathInfo; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse; +import org.osgi.annotation.versioning.ConsumerType; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.Configuration; @@ -68,8 +69,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import aQute.bnd.annotation.ConsumerType; - /** * Defines Sling context objects with lazy initialization. Should not be used * directly but via the {@link org.apache.sling.testing.mock.sling.junit.SlingContext} JUnit diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java index e440a9e..380fcf9 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java @@ -19,5 +19,5 @@ /** * Sling context implementation for unit tests. */ [email protected]("3.2") [email protected]("3.2.1") package org.apache.sling.testing.mock.sling.context; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java index d7acc84..73f9730 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java @@ -19,5 +19,5 @@ /** * Rule for providing easy access to Sling context in JUnit tests. */ [email protected]("3.2") [email protected]("3.2") package org.apache.sling.testing.mock.sling.junit; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java index 464320c..60ea1bb 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java @@ -19,5 +19,5 @@ /** * Helpers for importing test content into the mocked repositories / resource hierarchies. */ [email protected]("1.0") [email protected]("1.0") package org.apache.sling.testing.mock.sling.loader; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java index a0c9444..6456e2a 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java @@ -19,5 +19,5 @@ /** * Mock implementation of selected Sling APIs. */ [email protected]("2.0") [email protected]("2.0") package org.apache.sling.testing.mock.sling; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java index e919159..30212d1 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/services/package-info.java @@ -19,5 +19,5 @@ /** * Mocks for selected Sling services. */ [email protected]("2.0") [email protected]("2.0") package org.apache.sling.testing.mock.sling.services; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java index 67c2cbd..4d35479 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java @@ -19,5 +19,5 @@ /** * Mock implementation of selected Servlet-related Sling APIs. */ [email protected]("3.0") [email protected]("3.0") package org.apache.sling.testing.mock.sling.servlet; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java index 0316d03..99975db 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java @@ -19,5 +19,5 @@ /** * SPI for hooking in alternative resource type adapter implementations. */ [email protected]("1.0") [email protected]("1.0") package org.apache.sling.testing.mock.sling.spi; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
