[FELIX-4942] Upgrade to latest felix parent, fix jdk 5 compatibility issues
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1690734 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/resolver/pom.xml b/resolver/pom.xml
index 5a756d2..1c8cd58 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2.1</version>
+ <version>3</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,24 +55,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <felix.java.version>5</felix.java.version>
+ </properties>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.5</target>
- <source>1.5</source>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.5.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
<_sources>true</_sources>
+ <_sourcepath>${build.sourceDirectory}</_sourcepath>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>
org.apache.felix.resolver.Activator