FELIX-2669 move scr.annotations to scrplugin/annotations and reorder sources amongst the new modules
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1025937 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/maven-scr-plugin/pom.xml b/scrplugin/maven-scr-plugin/pom.xml
index 0ea3fdf..6bb2216 100644
--- a/scrplugin/maven-scr-plugin/pom.xml
+++ b/scrplugin/maven-scr-plugin/pom.xml
@@ -29,21 +29,21 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.5-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>1.4.5-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
- <name>Maven SCR Plugin</name>
- <description>
- Maven plugin for generating OSGi service descriptors based on annotations.
- </description>
+ <name>Maven SCR Plugin</name>
+ <description>
+ Maven plugin for generating OSGi service descriptors based on annotations.
+ </description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</developerConnection>
- <url>http://svn.apache.org/repos/asf/felix/scrplugin</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/maven-scr-plugin</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/maven-scr-plugin</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scrplugin/maven-scr-plugin</url>
+ </scm>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -55,84 +55,11 @@
<version>2.2</version>
</dependency>
- <!-- Ant Task Implementation -->
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.generator</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
-
- <!-- JavaDoc Tags -->
- <dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.12</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- SCR Annotations -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- bind/unbind method generation -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi APIs (some constant references used only) -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- unpack qdox, asm and annotations into bundle package -->
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>
- qdox,asm-all,org.apache.felix.scr.annotations
- </includeArtifactIds>
- <outputDirectory>
- ${project.build.outputDirectory}
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- JDK 1.5 needed for annotation support -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </dependencies>
</project>