提交 b6487f6d authored 作者: Thomas Mueller's avatar Thomas Mueller

Drop support for Java 6

上级 1c4406d1
......@@ -792,7 +792,7 @@ Calling <code>fsync</code> flushes the buffers. There are two ways to do that in
buffers to synchronize with the underlying device.
This method is supposed to return after all in-memory modified copies of buffers associated with this file descriptor
have been written to the physical medium.
</li><li><code>FileChannel.force()</code> (since JDK 1.4). This method is supposed
</li><li><code>FileChannel.force()</code>. This method is supposed
to force any updates to this channel's file to be written to the storage device that contains it.
</li></ul>
<p>
......
......@@ -47,29 +47,29 @@ It can also be compiled to a native executable using GCJ.
<h2 id="environment">Environment</h2>
<p>
To run this database, a Java Runtime Environment (JRE) version 1.5 or higher is required.
To run this database, a Java Runtime Environment (JRE) version 1.6 or higher is required.
</p>
<p>
To create the database executables, the following software stack was used.
To use this database, it is not required to install this software however.
</p>
<ul><li>Mac OS X and Windows XP
</li><li><a href="http://java.sun.com/javase/downloads">Sun JDK Version 1.5 and 1.6</a>
</li><li><a href="http://www.eclipse.org">Eclipse Version 3.4</a>
<ul><li>Mac OS X and Windows
</li><li><a href="http://java.sun.com/javase/downloads">Sun JDK Version 1.6 and 1.7</a>
</li><li><a href="http://www.eclipse.org">Eclipse</a>
</li><li>Eclipse Plugins:
<a href="http://subclipse.tigris.org">Subclipse</a>,
<a href="http://eclipse-cs.sourceforge.net">Eclipse Checkstyle Plug-in</a>,
<a href="http://www.eclemma.org">EclEmma Java Code Coverage 1.3.0</a>
<a href="http://www.eclemma.org">EclEmma Java Code Coverage</a>
</li><li><a href="http://emma.sourceforge.net">Emma Java Code Coverage</a>
</li><li><a href="http://www.mozilla.com/firefox">Mozilla Firefox</a>
</li><li><a href="http://www.openoffice.org">OpenOffice</a>
</li><li><a href="http://nsis.sourceforge.net">NSIS 2.38</a> (Nullsoft Scriptable Install System)
</li><li><a href="http://nsis.sourceforge.net">NSIS</a> (Nullsoft Scriptable Install System)
</li><li><a href="http://maven.apache.org">Maven</a>
</li></ul>
<h2 id="building">Building the Software</h2>
<p>
You need to install a JDK, for example the Sun JDK version 1.5 or 1.6.
You need to install a JDK, for example the Sun JDK version 1.6 or 1.7.
Ensure that Java binary directory is included in the <code>PATH</code> environment variable, and that
the environment variable <code>JAVA_HOME</code> points to your Java installation.
On the command line, go to the directory <code>h2</code> and execute the following command:
......@@ -92,7 +92,7 @@ To run the build tool in shell mode, use the command line option <code>-</code>
<h3>Switching the Source Code</h3>
<p>
By default the source code uses Java 1.6 features, however Java 1.5 is supported as well.
The source code uses Java 1.6 features.
To switch the source code to the installed version of Java, run:
</p>
<pre>
......@@ -217,7 +217,7 @@ The web site is currently translated using Google.
<p>
If you like to provide patches, please consider the following guidelines to simplify merging them:
</p>
<ul><li>Only use Java 1.5 features (do not use Java 1.6) (see <a href="#environment">Environment</a>).
<ul><li>Only use Java 6 features (do not use Java 7) (see <a href="#environment">Environment</a>).
</li><li>Follow the coding style used in the project, and use Checkstyle (see above) to verify.
For example, do not use tabs (use spaces instead).
The checkstyle configuration is in <code>src/installer/checkstyle.xml</code>.
......
......@@ -171,7 +171,7 @@ When using one of the following features for production, please ensure your use
is well tested (if possible with automated test cases). The areas that are not well tested are:
</p>
<ul>
<li>Platforms other than Windows XP, Linux, Mac OS X, or JVMs other than Sun 1.5 or 1.6
<li>Platforms other than Windows XP, Linux, Mac OS X, or JVMs other than Sun 1.6 or 1.7
</li><li>The features <code>AUTO_SERVER</code> and <code>AUTO_RECONNECT</code>.
</li><li>The file locking method 'Serialized'.
</li><li>Cluster mode, 2-phase commit, savepoints.
......
......@@ -34,7 +34,7 @@ Other software most likely also works, but is not tested as much.
<h3>Database Engine</h3>
<ul><li>Windows XP or Vista, Mac OS X, or Linux
</li><li>Sun JDK 1.5 or newer (using Retroweaver to convert to JDK 1.4 should work, but is not regularly tested)
</li><li>Sun Java 6 or newer
</li><li>Recommended Windows file system: NTFS (FAT32 only supports files up to 4 GB)
</li></ul>
......@@ -45,10 +45,10 @@ Other software most likely also works, but is not tested as much.
<h2 id="supported_platforms">Supported Platforms</h2>
<p>
As this database is written in Java, it can run on many different platforms.
It is tested with Java 1.5 and 1.6 but can also be compiled to native code using GCJ.
The source code does not use features of Java 1.6. Currently, the database is
developed and tested on Windows XP and Mac OS X using the Sun JDK 1.6, but it also
works in many other operating systems and using other Java runtime environments.
It is tested with Java 6 and 7.
Currently, the database is developed and tested on Windows 8
and Mac OS X using Java 6, but it also works in many other operating systems
and using other Java runtime environments.
All major operating systems (Windows XP, Windows Vista, Windows 7, Mac OS, Ubuntu,...) are supported.
</p>
......
......@@ -111,7 +111,7 @@ To create the JaQu jar file, run: <code>build jarJaqu</code>. This will create t
<h2 id="requirements">Requirements</h2>
<p>
JaQu requires Java 1.5. Annotations are not need.
JaQu requires Java 6. Annotations are not need.
Currently, JaQu is only tested with the H2 database engine, however in theory it should
work with any database that supports the JDBC API.
</p>
......
......@@ -208,7 +208,7 @@ For the Java databases, both embedded and server modes are tested.
<h4>Test Platform</h4>
<p>
This test is run on Mac OS X 10.6. No virus scanner was used, and disk indexing was disabled.
The VM used is Sun JDK 1.6.
The JVM used is Sun JDK 1.6.
</p>
<h4>Multiple Runs</h4>
......
......@@ -186,7 +186,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
</li><li>Support dynamic linked schema (automatically adding/updating/removing tables)
</li><li>Clustering: adding a node should be very fast and without interrupting clients (very short lock)
</li><li>Compatibility: # is the start of a single line comment (MySQL) but date quote (Access). Mode specific
</li><li>Run benchmarks with JDK 1.5, JDK 1.6, java -server
</li><li>Run benchmarks with Android, Java 7, java -server
</li><li>Optimizations: faster hash function for strings.
</li><li>DatabaseEventListener: callback for all operations (including expected time, RUNSCRIPT) and cancel functionality
</li><li>Benchmark: add a graph to show how databases scale (performance/database size)
......@@ -213,7 +213,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
</li><li>Trace: write OS, file system, JVM,... when opening the database
</li><li>Support indexes for views (probably requires materialized views)
</li><li>Document SET SEARCH_PATH, BEGIN, EXECUTE, parameters
</li><li>Browser: use Desktop.isDesktopSupported and browse when using JDK 1.6
</li><li>Server: use one listener (detect if the request comes from an PG or TCP client)
</li><li>Optimize SELECT MIN(ID), MAX(ID), COUNT(*) FROM TEST WHERE ID BETWEEN 100 AND 200
</li><li>Sequence: PostgreSQL compatibility (rename, create) http://www.postgresql.org/docs/8.2/static/sql-altersequence.html
......
......@@ -90,8 +90,7 @@ Depending on your platform and environment, there are multiple ways to start the
<td>Windows</td>
<td>
Click [Start], [All Programs], [H2], and [H2 Console (Command Line)]<br />
When using the Sun JDK 1.5, a window with the title 'H2 Console ' should appear.
When using the Sun JDK 1.6, an icon will be added to the system tray:
An icon will be added to the system tray:
<img src="images/db-64-t.png"
width="32" height="32"
alt="H2 database icon" /><br />
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论