Author: markt
Date: Mon Jan 12 12:34:41 2009
New Revision: 733892

URL: http://svn.apache.org/viewvc?rev=733892&view=rev
Log:
Servlet 3 requires a 1.6 JDK. *Really* need to fix DBCP...

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=733892&r1=733891&r2=733892&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan 12 12:34:41 2009
@@ -39,8 +39,8 @@
 #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

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=733892&r1=733891&r2=733892&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jan 12 12:34:41 2009
@@ -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="**" />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to