This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.osgi-mock-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 4f1cc0f023ecfb725649d9c78a698e1aaad5e3fe Author: Stefan Seifert <[email protected]> AuthorDate: Tue Jul 19 19:24:11 2016 +0000 SLING-5871 osgi-mock: Update to org.apache.felix.scr 2.0.4 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock@1753418 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5ef04c3..ec4f891 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <scope>provided</scope> </dependency> @@ -133,7 +133,7 @@ <configuration> <instructions> <Embed-Dependency> - org.apache.felix.scr;inline="org/apache/felix/scr/impl/helper/Annotations*|org/apache/felix/scr/impl/helper/Coercions*" + org.apache.felix.scr;inline="org/apache/felix/scr/impl/inject/Annotations*|org/apache/felix/scr/impl/helper/Coercions*" </Embed-Dependency> </instructions> </configuration> diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java index 3ba8ad4..9a4dafb 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.SortedSet; import org.apache.commons.lang3.StringUtils; -import org.apache.felix.scr.impl.helper.Annotations; +import org.apache.felix.scr.impl.inject.Annotations; import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.FieldCollectionType; import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.OsgiMetadata; import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.Reference; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
