Author: dkulp Date: Mon Jan 14 19:31:46 2013 New Revision: 1433067 URL: http://svn.apache.org/viewvc?rev=1433067&view=rev Log: Merged revisions 1433010 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1433010 | dkulp | 2013-01-14 12:58:33 -0500 (Mon, 14 Jan 2013) | 10 lines Merged revisions 1430882 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1430882 | dkulp | 2013-01-09 10:23:24 -0500 (Wed, 09 Jan 2013) | 2 lines Update to latest abdera which finally allows latest axiom ........ ........ Modified: cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml cxf/branches/2.6.x-fixes/parent/pom.xml Modified: cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1433067&r1=1433066&r2=1433067&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original) +++ cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml Mon Jan 14 19:31:46 2013 @@ -74,9 +74,10 @@ <bundle start-level='35'>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle> <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle> <bundle start-level='35'>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle> + <bundle start-level='35'>mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle> + <bundle start-level='35'>mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}</bundle> - <bundle start-level='35' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera-parser.bundle.version}</bundle> <!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle> <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>--> </feature> Modified: cxf/branches/2.6.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1433067&r1=1433066&r2=1433067&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Jan 14 19:31:46 2013 @@ -81,12 +81,11 @@ <cxf.osgi.javax.servlet.version>[0.0,4)</cxf.osgi.javax.servlet.version> <!-- please maintain alphabetical order here --> - <cxf.abdera.version>1.1.2</cxf.abdera.version> - <cxf.abdera-parser.bundle.version>1.1.2_1</cxf.abdera-parser.bundle.version> + <cxf.abdera.version>1.1.3</cxf.abdera.version> <!-- Due to AMQ-3276, we need to keep the system tests at 5.4.2, but we need the 5.5.0 features.xml. :-( --> <cxf.activemq.version>5.4.2</cxf.activemq.version> - <cxf.axiom.version>1.2.10</cxf.axiom.version> + <cxf.axiom.version>1.2.14</cxf.axiom.version> <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version> <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version> <cxf.commons-codec.version>1.6</cxf.commons-codec.version>
