Author: dkulp Date: Tue Sep 25 19:32:11 2012 New Revision: 1390091 URL: http://svn.apache.org/viewvc?rev=1390091&view=rev Log: Merged revisions 1390078 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1390078 | dkulp | 2012-09-25 15:24:06 -0400 (Tue, 25 Sep 2012) | 18 lines Merged revisions 1389588 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1389588 | dkulp | 2012-09-24 17:04:18 -0400 (Mon, 24 Sep 2012) | 10 lines Merged revisions 1389571 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1389571 | dkulp | 2012-09-24 16:57:15 -0400 (Mon, 24 Sep 2012) | 2 lines Fix issue with FI upgrade pulling in old xml API's that the JDK can provide ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/parent/pom.xml Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1390091&r1=1390090&r2=1390091&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Sep 25 19:32:11 2012 @@ -445,6 +445,10 @@ <groupId>javax.xml</groupId> <artifactId>jsr173</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jsr173_api</artifactId> + </exclusion> </exclusions> </dependency>
