Drop JDK 1.6. Require 1.7 or later.

uPortal-Project · Apr 7, 2014 · 03c751c · 03c751c
1 parent b3f8024
commit 03c751c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ uPortal uses Travis-CI for lightweight continuous integration.  You can see buil
 [![Master Branch Build Status](https://travis-ci.org/Jasig/uPortal.png?branch=master)](https://travis-ci.org/Jasig/uPortal)
 
 ## Requirements
-* JDK 1.6.0_26 or later - Just a JRE is not sufficient, a full JDK is required
+* JDK 1.7 or later - Just a JRE is not sufficient, a full JDK is required
 * Servlet 2.5 Container - Tomcat 6.0 is recommended, there some configuration changes that must be made for Tomcat 6.0 which are documented in the [uPortal manual](https://wiki.jasig.org/display/UPM40/Installing+Tomcat).
 * Maven 3.0.3 or later
 * Ant 1.8.2

diff --git a/bootstrap/build_includes.xml b/bootstrap/build_includes.xml
@@ -31,11 +31,10 @@
             </not>
         </condition>
     </fail>
-    <fail message="Unsupported Java version: ${java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
+    <fail message="Unsupported Java version: ${java.version}. Make sure that the version of the Java compiler is 1.7 (7.0) or greater.">
         <condition>
             <not>
                 <or>
-                    <contains string="${java.version}" substring="1.6" casesensitive="false" />
                     <contains string="${java.version}" substring="1.7" casesensitive="false" />
                 </or>
             </not>

diff --git a/pom.xml b/pom.xml
@@ -211,8 +211,8 @@
          +-->
         <mobile.user.agent.regex>(.*iPhone.*)|(.*Android.*)|(.*IEMobile.*)|(.*Safari.*Pre.*)|(.*Nokia.*AppleWebKit.*)|(.*Black[Bb]erry.*)|(.*Opera Mobile.*)|(.*Windows Phone.*)|(.*Fennec.*)|(.*Minimo.*)</mobile.user.agent.regex>
 
-        <project.build.sourceVersion>1.6</project.build.sourceVersion>
-        <project.build.targetVersion>1.6</project.build.targetVersion>
+        <project.build.sourceVersion>1.7</project.build.sourceVersion>
+        <project.build.targetVersion>1.7</project.build.targetVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -1302,6 +1302,7 @@
                                 <version>2.8</version>
                                 <configuration>
                                     <links>
+                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
                                         <link>http://java.sun.com/javase/6/docs/api/</link>
                                         <link>http://java.sun.com/javaee/5/docs/api/</link>
                                         <link>http://portals.apache.org/pluto/portlet-2.0-apidocs/</link>