Author: dkulp
Date: Tue Sep 6 20:40:31 2011
New Revision: 1165833
URL: http://svn.apache.org/viewvc?rev=1165833&view=rev
Log:
Merged revisions 1165832 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1165832 | dkulp | 2011-09-06 16:35:31 -0400 (Tue, 06 Sep 2011) | 1 line
Until all samples mavenized, allow Java 7 for builds
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/common_build.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/common_build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=1165833&r1=1165832&r2=1165833&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/common_build.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/common_build.xml
Tue Sep 6 20:40:31 2011
@@ -68,6 +68,7 @@
<or>
<equals arg1="${ant.java.version}" arg2="1.5"/>
<equals arg1="${ant.java.version}" arg2="1.6"/>
+ <equals arg1="${ant.java.version}" arg2="1.7"/>
</or>
</condition>
