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
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1025944 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/annotations/pom.xml b/scrplugin/annotations/pom.xml
index 9d2e6c1..326dd7b 100644
--- a/scrplugin/annotations/pom.xml
+++ b/scrplugin/annotations/pom.xml
@@ -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>
diff --git a/scrplugin/maven-scr-plugin/pom.xml b/scrplugin/maven-scr-plugin/pom.xml
index 25194bc..f390b26 100644
--- a/scrplugin/maven-scr-plugin/pom.xml
+++ b/scrplugin/maven-scr-plugin/pom.xml
@@ -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>
diff --git a/scrplugin/scrtask/pom.xml b/scrplugin/scrtask/pom.xml
index e2dad0e..c4a9260 100644
--- a/scrplugin/scrtask/pom.xml
+++ b/scrplugin/scrtask/pom.xml
@@ -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}