Author: sergeyb
Date: Mon Apr 11 21:02:59 2011
New Revision: 1091210
URL: http://svn.apache.org/viewvc?rev=1091210&view=rev
Log:
Merged revisions 1091204 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1091204 | sergeyb | 2011-04-11 21:58:14 +0100 (Mon, 11 Apr 2011) | 1 line
Updating Jettison version to 1.3
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/parent/pom.xml
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1091204
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=1091210&r1=1091209&r2=1091210&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Mon Apr 11 21:02:59 2011
@@ -530,7 +530,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1091210&r1=1091209&r2=1091210&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml Mon Apr 11 21:02:59 2011
@@ -115,7 +115,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -198,11 +197,4 @@
</plugins>
</build>
- <!-- will get removed immediately after Jettison 1.3 gets released and
pushed into Central-->
- <repositories>
- <repository>
- <id>codehause-snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
- </repositories>
</project>
