Author: fmeschbe
Date: Wed Apr 25 16:24:20 2012
New Revision: 1330391
URL: http://svn.apache.org/viewvc?rev=1330391&view=rev
Log:
FELIX-3486 Overwrite default parent POM setup of class file API use for Java 5
Modified:
felix/sandbox/fmeschbe/configadmin-R5/pom.xml
Modified: felix/sandbox/fmeschbe/configadmin-R5/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/fmeschbe/configadmin-R5/pom.xml?rev=1330391&r1=1330390&r2=1330391&view=diff
==============================================================================
--- felix/sandbox/fmeschbe/configadmin-R5/pom.xml (original)
+++ felix/sandbox/fmeschbe/configadmin-R5/pom.xml Wed Apr 25 16:24:20 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2</version>
+ <version>3-SNAPSHOT</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -76,8 +76,11 @@
</bundle.file.name>
<api-package-version>1.0</api-package-version>
- </properties>
+ <felix.build.source>5</felix.build.source>
+ <felix.build.target>5</felix.build.target>
+
<felix.java.signature.artifactId>java15</felix.java.signature.artifactId>
+ </properties>
<dependencies>
<dependency>
@@ -178,60 +181,6 @@
</instructions>
</configuration>
</plugin>
- <!-- Make sure to not use non Java 1.3 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>java13-sun</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 1.3 and integration
- test compilation for Java 5 (since integration tests use
- Java Annotations for Pax Exam)
- -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>test-compile-java5</id>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <testExcludes>
- <testExclude>**/cm/*</testExclude>
- <testExclude>**/cm/file/*</testExclude>
- <testExclude>**/cm/impl/**</testExclude>
- </testExcludes>
- <testIncludes>
- <testInclude>**/integration/**</testInclude>
- </testIncludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <testExcludes>
- <testExclude>**/integration/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
<!--
Exclude Integration tests in (default) unit tests and
