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 2015/11/24 13:17:28 UTC

svn commit: r1716118 - /sling/trunk/testing/mocks/osgi-mock/pom.xml

Author: sseifert
Date: Tue Nov 24 12:17:28 2015
New Revision: 1716118

URL: http://svn.apache.org/viewvc?rev=1716118&view=rev
Log:
SLING-5327 inline the required classes from org.apache.felix.scr

Modified:
    sling/trunk/testing/mocks/osgi-mock/pom.xml

Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1716118&r1=1716117&r2=1716118&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Tue Nov 24 12:17:28 2015
@@ -87,11 +87,12 @@
             <version>5.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- The required classes o.a.f.scr.impl.helper.Annotations and o.a.f.scr.impl.helper.Coercions are inlined -->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
             <version>2.0.2</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -141,6 +142,13 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Embed-Dependency>
+                            org.apache.felix.scr;inline="org/apache/felix/scr/impl/helper/Annotations*|org/apache/felix/scr/impl/helper/Coercions*"
+                        </Embed-Dependency>
+                    </instructions>
+                </configuration>
             </plugin>
       
             <plugin>