提交 65f4271d authored 作者: Noel Grandin's avatar Noel Grandin

update our docs to reflect Java7 dependency

上级 91b2048d
......@@ -32,8 +32,8 @@
</developers>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<derby.version>10.10.1.1</derby.version>
<osgi.version>4.2.0</osgi.version>
<slf4j.version>1.6.0</slf4j.version>
......@@ -131,7 +131,7 @@
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.6</version>
<version>1.7</version>
<scope>system</scope>
<systemPath>${tools.jar}</systemPath>
</dependency>
......
......@@ -50,14 +50,14 @@ 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.6 or higher is required.
To run this database, a Java Runtime Environment (JRE) version 1.7 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
</li><li><a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Oracle JDK Version 1.6 and 1.7</a>
</li><li><a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Oracle JDK Version 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>,
......@@ -72,7 +72,7 @@ To use this database, it is not required to install this software however.
<h2 id="building">Building the Software</h2>
<p>
You need to install a JDK, for example the Oracle JDK version 1.6 or 1.7.
You need to install a JDK, for example the Oracle JDK version 1.7 or 1.8.
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:
......@@ -95,7 +95,7 @@ To run the build tool in shell mode, use the command line option <code>-</code>
<h3>Switching the Source Code</h3>
<p>
The source code uses Java 1.6 features.
The source code uses Java 1.7 features.
To switch the source code to the installed version of Java, run:
</p>
<pre>
......
......@@ -36,7 +36,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 Java 6 or newer
</li><li>Oracle Java 7 or newer
</li><li>Recommended Windows file system: NTFS (FAT32 only supports files up to 4 GB)
</li></ul>
......@@ -47,9 +47,9 @@ 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 6 and 7.
It is tested with Java 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 Mac OS X using Java 7, 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>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论