svn commit: r1602017 - /uima/build/trunk/parent-pom/pom.xml

[re...@apache.org]

Author: rec
Date: Wed Jun 11 21:20:24 2014
New Revision: 1602017

URL: http://svn.apache.org/r1602017
Log:
[UIMA-3875] Upgrade parent-pom to Java 6
- Set compiler source/target level to 1.6
- Set required execution environment for OSGi bundles to J2SE-1.6

Modified:
    uima/build/trunk/parent-pom/pom.xml

Modified: uima/build/trunk/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-pom/pom.xml?rev=1602017&r1=1602016&r2=1602017&view=diff
==============================================================================
--- uima/build/trunk/parent-pom/pom.xml (original)
+++ uima/build/trunk/parent-pom/pom.xml Wed Jun 11 21:20:24 2014
@@ -31,8 +31,8 @@
       Central - adds default check-the checksums
       
     PluginManagement defaults:
-      Java 1.5 as the base
-      Javadoc at 1.5 too
+      Java 1.6 as the base
+      Javadoc at 1.6 too
       Jar Manifest entries, including the build-time
       AntRun to pick a later version of ant with support for ant extensions like "if"
       
@@ -354,13 +354,13 @@ Copyright (c) 2003, 2006 IBM Corporation
           </configuration>    
         </plugin>
         
-        <!-- set Java 1.5 as the source and target of compilation -->
+        <!-- set Java 1.6 as the source and target of compilation -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
+            <source>1.6</source>
+            <target>1.6</target>
             <!--encoding>UTF-8</encoding this inherited from apache pom 7 -->
           </configuration>
         </plugin>
@@ -602,7 +602,7 @@ Copyright (c) 2003, 2006 IBM Corporation
                   <version>3.0</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>1.5</version>
+                  <version>1.6</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -2193,7 +2193,7 @@ Copyright (c) 2003, 2006 IBM Corporation
                     <Import-Package>org.apache.log.*;resolution:=optional</Import-Package>
                     <Embed-Dependency>*;scope=compile;</Embed-Dependency>
                     <Embed-Directory>lib</Embed-Directory>
-                    <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+                    <Bundle-RequiredExecutionEnvironment>J2SE-1.6</Bundle-RequiredExecutionEnvironment>
                     <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
                     <Bundle-ClassPath>.,lib/${project.build.finalName}.jar,{maven-dependencies},lib/uimaj-core-${uimaDependencyVersion}.jar</Bundle-ClassPath>
                     <Include-Resource>