Author: dkulp
Date: Tue Sep 18 12:02:48 2007
New Revision: 577017
URL: http://svn.apache.org/viewvc?rev=577017&view=rev
Log:
[CXF-985] check for jdk 1.6 as well
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?rev=577017&r1=577016&r2=577017&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Tue Sep 18 12:02:48 2007
@@ -58,10 +58,13 @@
</path>
<condition property="is.java.version.15">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </or>
</condition>
- <fail message="Apache CXF requires Java version 1.5. You are currently
using Java version ${ant.java.version}."
+ <fail message="Apache CXF requires Java version 1.5 or higher. You are
currently using Java version ${ant.java.version}."
unless="is.java.version.15"/>
