cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1167172 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/samples/common_build.xml
Date Fri, 09 Sep 2011 14:00:21 GMT
Author: dkulp
Date: Fri Sep  9 14:00:21 2011
New Revision: 1167172

URL: http://svn.apache.org/viewvc?rev=1167172&view=rev
Log:
Merged revisions 1165833 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1165833 | dkulp | 2011-09-06 16:40:31 -0400 (Tue, 06 Sep 2011) | 9 lines
  
  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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=1167172&r1=1167171&r2=1167172&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml Fri Sep
 9 14:00:21 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>
 



Mime
View raw message