You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/07/19 19:24:11 UTC

svn commit: r1753418 - in /sling/trunk/testing/mocks/osgi-mock: pom.xml src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java

Author: sseifert
Date: Tue Jul 19 19:24:11 2016
New Revision: 1753418

URL: http://svn.apache.org/viewvc?rev=1753418&view=rev
Log:
SLING-5871 osgi-mock: Update to org.apache.felix.scr 2.0.4

Modified:
    sling/trunk/testing/mocks/osgi-mock/pom.xml
    sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java

Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1753418&r1=1753417&r2=1753418&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Tue Jul 19 19:24:11 2016
@@ -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>

Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java?rev=1753418&r1=1753417&r2=1753418&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java Tue Jul 19 19:24:11 2016
@@ -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;