FELIX-3708 update to java 5 for type safety during development
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1397394 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 4fc4edc..5deeafa 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
+ <version>4.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -330,6 +330,7 @@
- for now touch base on Java 1.4
- Ignore some known Java 5 classes (used in JLock)
-->
+<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -360,6 +361,7 @@
</execution>
</executions>
</plugin>
+-->
<!--
Configure default compilation for Java 1.3 and integration
@@ -370,47 +372,49 @@
-->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-java5</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <excludes>
- <exclude>dummy-to-overwrite-global-config</exclude>
- </excludes>
- <includes>
- <include>**/ScrGogoCommand.java</include>
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>test-compile-java5</id>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <testIncludes>
- <testInclude>**/integration/**</testInclude>
- </testIncludes>
- <testExcludes>
- <testExclude>**/impl/**</testExclude>
- </testExcludes>
- </configuration>
- </execution>
- </executions>
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>compile-java5</id>-->
+ <!--<goals>-->
+ <!--<goal>compile</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<source>1.5</source>-->
+ <!--<target>1.5</target>-->
+ <!--<excludes>-->
+ <!--<exclude>dummy-to-overwrite-global-config</exclude>-->
+ <!--</excludes>-->
+ <!--<includes>-->
+ <!--<include>**/ScrGogoCommand.java</include>-->
+ <!--</includes>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--<execution>-->
+ <!--<id>test-compile-java5</id>-->
+ <!--<goals>-->
+ <!--<goal>testCompile</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<source>1.5</source>-->
+ <!--<target>1.5</target>-->
+ <!--<testIncludes>-->
+ <!--<testInclude>**/integration/**</testInclude>-->
+ <!--</testIncludes>-->
+ <!--<testExcludes>-->
+ <!--<testExclude>**/impl/**</testExclude>-->
+ <!--</testExcludes>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
<configuration>
- <testExcludes>
- <testExclude>**/integration/**</testExclude>
- </testExcludes>
- <excludes>
- <exclude>**/ScrGogoCommand.java</exclude>
- </excludes>
+ <source>1.5</source>
+ <target>1.5</target>
+ <!--<testExcludes>-->
+ <!--<testExclude>**/integration/**</testExclude>-->
+ <!--</testExcludes>-->
+ <!--<excludes>-->
+ <!--<exclude>**/ScrGogoCommand.java</exclude>-->
+ <!--</excludes>-->
</configuration>
</plugin>