Servlet 3 requires a 1.6 JDK. *Really* need to fix DBCP...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@733892 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 156cd27..9090ce2 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -39,8 +39,8 @@ base.path=/usr/share/java
 #base.path=C:/path/to/the/repository
 #base.path=/usr/local
 
-compile.source=1.5
-compile.target=1.5
+compile.source=1.6
+compile.target=1.6
 compile.debug=true
 
 base-commons.loc=http://archive.apache.org/dist/commons

diff --git a/build.xml b/build.xml
index bebd8b4..5d73ce8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -783,12 +783,13 @@
       <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
     </move>
     <mkdir dir="${tomcat-dbcp.home}/classes"/>
+    <!-- TODO Fix DBCP so it builds on 1.6 JDKs -->
     <javac destdir="${tomcat-dbcp.home}/classes"
            optimize="off"
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           target="${compile.target}"
+           source="1.5"
+           target="1.5"
            sourcepath="${tomcat-dbcp.home}/src/java"
            srcdir="${tomcat-dbcp.home}/src/java" >
       <include name="**" />