From 367a26c8f03960e4338f193864013b979fddd8f8 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 25 Nov 2009 00:36:50 +0000
Subject: [PATCH] fixed supported HSQL/H2 version range (SPR-6403)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2506 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.jdbc/template.mf    | 6 +++---
 spring-framework-reference/src/jdbc.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index 12e44cb41fe..8af078c1a56 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -17,9 +17,9 @@ Import-Template:
  javax.sql.*;version="0",
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  javax.xml.*;version="0";resolution:=optional,
- org.h2.*;version="[1.8.0, 2.0.0)";resolution:=optional,
- org.hsqldb.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.apache.derby.*;version="[10.5.1000001.764942, 10.6.0)";resolution:=optional,
+ org.h2.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.hsqldb.*;version="[1.8.0, 2.0.0)";resolution:=optional,
+ org.apache.derby.*;version="[10.5.0, 11.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
diff --git a/spring-framework-reference/src/jdbc.xml b/spring-framework-reference/src/jdbc.xml
index 11b7ae20889..53291b8c2fe 100644
--- a/spring-framework-reference/src/jdbc.xml
+++ b/spring-framework-reference/src/jdbc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <chapter id="jdbc">
@@ -2811,7 +2811,7 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
     <section id="jdbc-embedded-database-using-HSQL">
       <title>Using HSQL</title>
 
-      <para>Spring supports HSQL 1.0.0 to 2.0.0. HSQL is the default embedded
+      <para>Spring supports HSQL 1.8.0 and above. HSQL is the default embedded
       database if no type is specified explicitly. To specify HSQL explicitly, 
       set the <literal>type</literal> attribute of the
       <literal>embedded-database</literal> tag to <literal>HSQL</literal>. If
@@ -2823,7 +2823,7 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
     <section id="jdbc-embedded-database-using-H2">
       <title>Using H2</title>
 
-      <para>Spring supports H2 1.8.0 to 2.0.0. To enable H2, set the
+      <para>Spring supports the H2 database as well. To enable H2, set the
       <literal>type</literal> attribute of the
       <literal>embedded-database</literal> tag to <literal>H2</literal>. If
       you are using the builder API, call the
@@ -2834,7 +2834,7 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
     <section id="jdbc-embedded-database-using-Derby">
       <title>Using Derby</title>
 
-      <para>Spring supports Apache Derby 10.5.1.1 to 10.6.0. To enable Derby,
+      <para>Spring also supports Apache Derby 10.5 and above. To enable Derby,
       set the <literal>type</literal> attribute of the
       <literal>embedded-database</literal> tag to <literal>Derby</literal>. If
       using the builder API, call the