Author: ffang
Date: Thu Dec 9 03:45:44 2010
New Revision: 1043832
URL: http://svn.apache.org/viewvc?rev=1043832&view=rev
Log:
Merged revisions 1043824-1043830 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1043824 | ffang | 2010-12-09 10:45:27 +0800 (四, 09 12 2010) | 1 line
[CXF-3178]build failed on Mac OSX caused by Failed to resolve artifact.
om.sun:tools:jar:1.5.0
........
r1043830 | ffang | 2010-12-09 11:18:45 +0800 (四, 09 12 2010) | 1 line
[CXF-3178]build failed on Mac OSX caused by Failed to resolve artifact.
om.sun:tools:jar:1.5.0
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1043832&r1=1043831&r2=1043832&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Thu Dec 9 03:45:44 2010
@@ -91,7 +91,6 @@
<cxf.pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</cxf.pmd.eclipse.ruleset>
<cxf.resources.base.path />
-
</properties>
@@ -186,6 +185,12 @@
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>5.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>