Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-22 09:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix up karaf-itests , related commits https://issues.apache.org/jira/browse/AMQ-5224 https://issues.apache.org/jira/browse/AMQ-5105 Update poms to fully load into M2E - 06bb7a2716f0cea216381b03f555dd497cb627ef

Browse Source
This commit is contained in:
gtully 2014-07-28 15:30:12 +01:00
parent 60bc089531
commit 66a689df0e
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq-nd-camel.xml
View File

@ -69,7 +69,7 @@
</transportConnectors>
</broker>
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory">
<property name="brokerURL" value="tcp://localhost:61616?jms.dispatchAsync=false"/>
<property name="userName" value="karaf" />
<property name="password" value="karaf" />

2
activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/camel.xml
View File

@ -23,7 +23,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory">
<property name="brokerURL" value="tcp://localhost:61616?jms.dispatchAsync=false"/>
<property name="userName" value="karaf" />
<property name="password" value="karaf" />

5
activemq-karaf/src/main/resources/features-core.xml
View File

@ -57,8 +57,9 @@
<bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
<bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
<bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
</feature>
</features>

4
activemq-leveldb-store/pom.xml
View File

@ -238,6 +238,10 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

2
activemq-osgi/pom.xml
View File

@ -49,7 +49,7 @@
org.apache.http*;resolution:=optional,
org.apache.xpath*;resolution:=optional,
org.bouncycastle*;resolution:=optional,
org.codehaus.jackson*;resolution:=optional,
com.fasterxml.jackson*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.jasypt*;resolution:=optional,
org.eclipse.jetty*;resolution:=optional,

1
activemq-partition/src/main/java/org/apache/activemq/partition/PartitionBrokerPlugin.java
View File

@ -19,7 +19,6 @@ package org.apache.activemq.partition;
import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.partition.dto.Partitioning;
import org.codehaus.jackson.JsonParseException;
import java.io.IOException;

3
activemq-web-console/pom.xml
View File

@ -172,8 +172,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.2_spec</artifactId>
<version>1.2</version>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>