Author: kkolinko Date: Sat Aug 11 17:23:27 2012 New Revision: 1371983 URL: http://svn.apache.org/viewvc?rev=1371983&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53601 Clarify that building Tomcat 7 from sources requires Java 6 JDK.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/BUILDING.txt tomcat/tc7.0.x/trunk/webapps/docs/building.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1371017,1371976,1371978 Modified: tomcat/tc7.0.x/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1371983&r1=1371982&r2=1371983&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/BUILDING.txt (original) +++ tomcat/tc7.0.x/trunk/BUILDING.txt Sat Aug 11 17:23:27 2012 @@ -37,10 +37,32 @@ source distribution, do the following: 1. If the JDK is already installed, skip to (2). - 2. Download a Java Development Kit (JDK) release (version 1.6.x or later) - from: + 2. Download a version 6 of Java Development Kit (JDK) release (use the + latest update available for your chosen version) from http://www.oracle.com/technetwork/java/javase/downloads/index.html + or from another JDK vendor. + + Note regarding later versions of Java: + + As documented elsewhere, one of components in Apache Tomcat includes + a private copy of the Apache Commons DBCP library. The source code + for this library is downloaded, processed by the build script + (renaming the packages) and compiled. + + Due to changes in JDBC interfaces implemented by the library between + versions of Java SE specification, the library has to target specific + version of Java and can be compiled only with the JDK version + implementing this version of specification. + + See Apache Commons DBCP project web site for more details on + available versions of the library and its requirements, + + http://commons.apache.org/dbcp/ + + If you really want to use a later version of JDK to build Tomcat, + several workarounds are possible. One of them is to skip building + the component (tomcat-dbcp.jar). 3. Install the JDK according to the instructions included with the release. Modified: tomcat/tc7.0.x/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/building.xml?rev=1371983&r1=1371982&r2=1371983&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/building.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/building.xml Sat Aug 11 17:23:27 2012 @@ -42,12 +42,12 @@ Tomcat. The following is a step by step </section> -<section name="Download a Java Development Kit (JDK) 1.6 or later"> +<section name="Download a Java Development Kit (JDK) version 6"> <p> -Tomcat requires a JDK (version 1.6 or later) to be installed. -<br/>The Sun JDK can be downloaded -<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">here</a>. +Building Apache Tomcat requires a JDK (version 6) to be installed. You can download one from<br /> +<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a><br/> +or from another JDK vendor. </p> <p> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1371983&r1=1371982&r2=1371983&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 17:23:27 2012 @@ -170,6 +170,10 @@ (markt) </fix> <fix> + <bug>53601</bug>: Clarify in documentation that building Apache Tomcat 7 + from sources requires a Java 6 JDK. (kkolinko) + </fix> + <fix> <bug>53653</bug>: Allow for wrapped source code example in config/context.html. Patch provided by Terence Bandoian. (schultz) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org