Update to new parent pom

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1689296 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 3debc8f..fb60390 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>2.1</version>
+        <version>3</version>
         <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -242,42 +242,6 @@
                 </configuration>
             </plugin>
 
-            <!--
-                Ensure not using too recent Java API
-                - Ensure Java 5 API
-            -->
-             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.7</version>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java15</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!--
-                Configure default compilation for Java 5
-            -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
             <!-- plain unit tests -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -404,17 +368,6 @@
             </dependencies>
         </profile>
         <profile>
-            <id>felix-R5</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.apache.felix.framework</artifactId>
-                    <version>4.0.3</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
             <id>equinox</id>
             <dependencies>
                 <dependency>
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
index 9636f83..789885b 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
@@ -29,7 +29,7 @@
  */
 public class ReferenceMetadata
 {
-	public enum ReferenceScope {bundle, prototype}
+	public enum ReferenceScope {bundle, prototype, prototype_required}
 
     // constant for option single reference - 0..1
     public static final String CARDINALITY_0_1 = "0..1";