Author: ningjiang
Date: Fri Nov 2 04:31:52 2012
New Revision: 1404874
URL: http://svn.apache.org/viewvc?rev=1404874&view=rev
Log:
Merged revisions 1404870 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1404870 | ningjiang | 2012-11-02 12:17:49 +0800 (Fri, 02 Nov 2012) | 1 line
CXF-4585 reverted the change
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1404870
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml?rev=1404874&r1=1404873&r2=1404874&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml Fri Nov 2 04:31:52
2012
@@ -102,9 +102,9 @@
org.apache.cxf.sts.*;version=${project.version}
</Export-Package>
<Import-Package>
- org.apache.cxf.sts.provider.*;version="[2.6,3)",
+
org.apache.cxf.sts.provider.*;version=${project.version},
!org.apache.cxf.sts.*,
- org.apache.cxf.*;version="[2.6,3)",
+ org.apache.cxf.*;version=${project.version},
javax.xml.ws*;version="[0.0,3)",
org.springframework.ldap*;resolution:=optional,
*
