Java version check (#9299)

diff --git a/build.properties b/build.properties
index 7da02058ac24e9b6129fc0680d3f36b2b7b3937c..0a4f894b4b76b2be829cb072d5c2991508e7cd86 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,7 @@ javadoc.doctitle=<h1>Vaadin</h1>
 javadoc.bottom=<i>Copyright &#169; 2000-2011 Vaadin Ltd. All Rights Reserved.</i>
 ivy.organisation=com.vaadin
 vaadin.vendor=Vaadin Ltd
-vaadin.java.version=6
+vaadin.java.version=1.6
 vaadin.version=0.0.0.noversion
 
 

diff --git a/build.xml b/build.xml
index 44965003c038eca9ea93a5ed97382692da253a18..85a7ed547ad3825bf918fb365fc7474fba69f08d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,7 @@
                </subant>
        </target>
 
-       <target name="buildorder">
+       <target name="buildorder" depends="official.build.checks">
                <!-- Find out a good build order -->
                <ivy:buildlist reference="build-path">
                        <fileset dir="." includes="**/build.xml">
@@ -38,4 +38,12 @@
                </subant>
        </target>
 
+       <target name="official.build.checks" if="official.build">
+               <condition property="java.version.matches">
+                       <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" />
+               </condition>
+               <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." />
+               <echo>Java version is ${ant.java.version} as required.</echo>
+       </target>
+
 </project>