You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/10/21 13:04:23 UTC
svn commit: r1025944 - in /felix/trunk/scrplugin: annotations/pom.xml maven-scr-plugin/pom.xml scrtask/pom.xml

Author: fmeschbe
Date: Thu Oct 21 11:04:23 2010
New Revision: 1025944

URL: http://svn.apache.org/viewvc?rev=1025944&view=rev
Log:
FELIX-2669 A few more dependency fixes:
  - maven plugin and ant task must refer to scr.annotations
  - ant task must include scr.annotations
  - scr.annotations do not require compile scope for generator

Modified:
    felix/trunk/scrplugin/annotations/pom.xml
    felix/trunk/scrplugin/maven-scr-plugin/pom.xml
    felix/trunk/scrplugin/scrtask/pom.xml

Modified: felix/trunk/scrplugin/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/pom.xml?rev=1025944&r1=1025943&r2=1025944&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/pom.xml (original)
+++ felix/trunk/scrplugin/annotations/pom.xml Thu Oct 21 11:04:23 2010
@@ -48,7 +48,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.generator</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1025944&r1=1025943&r2=1025944&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Thu Oct 21 11:04:23 2010
@@ -54,13 +54,18 @@
             <artifactId>maven-archiver</artifactId>
             <version>2.2</version>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.generator</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <version>1.3.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     
     <build>

Modified: felix/trunk/scrplugin/scrtask/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/pom.xml?rev=1025944&r1=1025943&r2=1025944&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/pom.xml (original)
+++ felix/trunk/scrplugin/scrtask/pom.xml Thu Oct 21 11:04:23 2010
@@ -57,6 +57,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <version>1.3.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -71,7 +77,7 @@
                         </goals>
                         <configuration>
                             <includeArtifactIds>
-                                qdox,asm-all,org.apache.felix.scr.annotations
+                                org.apache.felix.scr.generator,qdox,asm-all,org.apache.felix.scr.annotations
                             </includeArtifactIds>
                             <outputDirectory>
                                 ${project.build.outputDirectory}