Update system requirements to include Java 7
git-svn-id: https://svn.apache.org/repos/asf/servicemix/documentation/trunk@1479165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/webapp/quickstart/installation.conf b/src/main/webapp/quickstart/installation.conf
index 77ba742..d969a02 100644
--- a/src/main/webapp/quickstart/installation.conf
+++ b/src/main/webapp/quickstart/installation.conf
@@ -2,16 +2,27 @@
Before we can start working with Apache ServiceMix, we have to get it installed and running on our local machine first.
h2. System requirements
-* Java Developer Kit (JDK) 1.6.x (Java 6), for both deployment and compiling. \\ (Note: Java 7 is currently not supported)
-* About 100 MB of free disk space
+
+For running Apache ServiceMix itself, you'll need
+
+* Java Runtime Environment (JRE) 1.6.x (Java 6) or
+ Java Runtime Environment (JRE) 1.7.x (Java 7)
+* About 100 MB of free disk space for the default assembly
+
+If you're developing your own integration applications and OSGi bundles, you'll also need
+
+* Java Developer Kit (JDK) 1.6.x (Java 6) or
+ Java Developer Kit (JDK) 1.7.x (Java 7)
+* Apache Maven 3.0.4 or higher
+
h2. Downloading Apache ServiceMix
Apache ServiceMix ${servicemix.version} is available under the Apache License v2 and can be downloaded from [http://servicemix.apache.org/downloads.html].
Depending on your operation system, you should download either the tar.gz or the zip file:
-* tar.gz for Linux/Unix/MacOS X
-* zip for Windows
+* {{tar.gz}} for Linux/Unix/MacOS X
+* {{zip}} for Windows
h2. Installing Apache ServiceMix
