Author: sergeyb
Date: Fri Sep 21 14:09:38 2012
New Revision: 1388508
URL: http://svn.apache.org/viewvc?rev=1388508&view=rev
Log:
Merged revisions 1388505 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1388505 | sergeyb | 2012-09-21 15:07:30 +0100 (Fri, 21 Sep 2012) | 1 line
[CXF-4508] Adding an extra OSGI import into the search module
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1388505
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/pom.xml?rev=1388508&r1=1388507&r2=1388508&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/pom.xml Fri Sep 21
14:09:38 2012
@@ -36,6 +36,9 @@
<properties>
<hibernate.em.version>4.1.0.Final</hibernate.em.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
+ <cxf.osgi.import>
+ org.apache.cxf.jaxrs.impl.tl
+ </cxf.osgi.import>
</properties>
<dependencies>
