If CXF is supposed to run on JDK 5, we should keep using Activemq 5.4 as 5.5 can't be used on JDK 5 afaik.
On Tue, Oct 11, 2011 at 23:02, <dk...@apache.org> wrote: > Author: dkulp > Date: Tue Oct 11 21:02:14 2011 > New Revision: 1182085 > > URL: http://svn.apache.org/viewvc?rev=1182085&view=rev > Log: > Use a working activemq feature > > Modified: > cxf/trunk/osgi/karaf/features/src/main/resources/features.xml > cxf/trunk/parent/pom.xml > > Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml > URL: > http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1182085&r1=1182084&r2=1182085&view=diff > > ============================================================================== > --- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml > (original) > +++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Oct > 11 21:02:14 2011 > @@ -17,7 +17,7 @@ > limitations under the License. > --> > <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; > name="cxf-${project.version}"> > - > > <repository>mvn:org.apache.activemq/activemq-karaf/${cxf.activemq.version}/xml/features</repository> > + > > <repository>mvn:org.apache.activemq/activemq-karaf/${cxf.osgi.activemq.version}/xml/features</repository> > > <feature name="cxf-specs" version="${project.version}" > resolver='(obr)'> > <bundle > start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle> > > Modified: cxf/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1182085&r1=1182084&r2=1182085&view=diff > > ============================================================================== > --- cxf/trunk/parent/pom.xml (original) > +++ cxf/trunk/parent/pom.xml Tue Oct 11 21:02:14 2011 > @@ -56,7 +56,10 @@ > > <!-- please maintain alphabetical order here --> > <cxf.abdera.version>1.1.2</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.osgi.activemq.version>5.5.0</cxf.osgi.activemq.version> > <cxf.derby.version>10.2.2.0</cxf.derby.version> > > <cxf.jaxb21.version>2.1</cxf.jaxb21.version> > > > -- ------------------------ Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/ ------------------------ Open Source SOA http://fusesource.com
