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/ds-annotations/pom.xml b/scrplugin/ds-annotations/pom.xml
index fb3e1ac..9417059 100644
--- a/scrplugin/ds-annotations/pom.xml
+++ b/scrplugin/ds-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>