FELIX-2689 - Upgrade Descriptor generator to new parent POM and adapt legal files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1372268 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/annotations/pom.xml b/scrplugin/annotations/pom.xml
index c6b4ed8..5313ed0 100644
--- a/scrplugin/annotations/pom.xml
+++ b/scrplugin/annotations/pom.xml
@@ -20,10 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.2.0</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>2.1</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.felix</groupId>
@@ -53,20 +53,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DEPENDENCIES</include>
- </includes>
- </resource>
- </resources>
<plugins>
<!-- JDK 1.5 needed for annotation support -->