You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/12/05 18:09:31 UTC
svn commit: r1210535 - in /cxf/branches/2.3.x-fixes: ./
distribution/bundle/jaxrs/pom.xml
Author: sergeyb
Date: Mon Dec 5 17:09:30 2011
New Revision: 1210535
URL: http://svn.apache.org/viewvc?rev=1210535&view=rev
Log:
Merged revisions 1210532 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1210532 | sergeyb | 2011-12-05 17:04:25 +0000 (Mon, 05 Dec 2011) | 9 lines
Merged revisions 1210527 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1210527 | sergeyb | 2011-12-05 16:57:09 +0000 (Mon, 05 Dec 2011) | 1 line
[CXF-3949] Making javax.ws.rs imports non-optional for the jaxrs bundle only
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 5 17:09:30 2011
@@ -0,0 +1,2 @@
+/cxf/branches/2.4.x-fixes:1210532
+/cxf/trunk:1210527
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1210535&r1=1210534&r2=1210535&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Mon Dec 5 17:09:30 2011
@@ -135,7 +135,6 @@
com.ctc.wstx.msv*;resolution:=optional,
org.codehaus.stax2*;resolution:=optional,
javax.ws.rs*,
- repackage;resolution:=optional,
javax.resource*;resolution:=optional,
junit.framework*;resolution:=optional,
net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",