Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6b2066573 -> e49ef9dbd
Update supported versions in generated build.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80121de4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80121de4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80121de4 Branch: refs/heads/3.1.x-fixes Commit: 80121de418c1bba8cdf61ff41a87830ee71c2372 Parents: 6b20665 Author: Daniel Kulp <[email protected]> Authored: Mon Mar 27 14:57:02 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Mon Mar 27 15:52:12 2017 -0400 ---------------------------------------------------------------------- .../cxf/tools/wsdlto/frontend/jaxws/template/build.vm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/80121de4/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm index fbfaeed..454b85d 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm @@ -38,15 +38,16 @@ <pathelement location="${tools.jar}"/> </path> - <condition property="is.java.version.16"> + <condition property="is.supported.java.version"> <or> - <equals arg1="${ant.java.version}" arg2="1.6"/> <equals arg1="${ant.java.version}" arg2="1.7"/> + <equals arg1="${ant.java.version}" arg2="1.8"/> + <equals arg1="${ant.java.version}" arg2="1.9"/> </or> </condition> - <fail message="cxf requires Java version 1.6 or higher. You are currently using Java version ${ant.java.version}." - unless="is.java.version.16"/> + <fail message="cxf requires Java version 1.7 or higher. You are currently using Java version ${ant.java.version}." + unless="is.supported.java.version"/> <!-- Determine cxf.home, either from the environment variable CXF_HOME - or using ../..
