Author: dkulp Date: Tue Sep 25 19:32:03 2012 New Revision: 1390088 URL: http://svn.apache.org/viewvc?rev=1390088&view=rev Log: Merged revisions 1390073 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1390073 | dkulp | 2012-09-25 15:23:53 -0400 (Tue, 25 Sep 2012) | 18 lines Merged revisions 1389583 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1389583 | dkulp | 2012-09-24 17:04:05 -0400 (Mon, 24 Sep 2012) | 10 lines Merged revisions 1389546 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1389546 | dkulp | 2012-09-24 16:05:13 -0400 (Mon, 24 Sep 2012) | 2 lines Update some sun deps ........ ........ ........ 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=1390088&r1=1390087&r2=1390088&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:03 2012 @@ -439,7 +439,7 @@ <dependency> <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> - <version>1.2.9</version> + <version>1.2.12</version> <exclusions> <exclusion> <groupId>javax.xml</groupId> @@ -539,7 +539,7 @@ <dependency> <groupId>com.sun.xml.parsers</groupId> <artifactId>jaxp-ri</artifactId> - <version>1.4.2</version> + <version>1.4.5</version> </dependency> <dependency> <groupId>antlr</groupId>
