mirror of https://github.com/apache/activemq.git
reverting to annotation spec 1.0 and including activemq-ra in the feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982934 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
74495451af
commit
474a30d7ce
|
@ -51,7 +51,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-annotation_1.1_spec</artifactId>
|
||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-annotation_1.1_spec</artifactId>
|
||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -116,7 +116,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-annotation_1.1_spec</artifactId>
|
||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<repository>mvn:org.apache.karaf/apache-karaf/${karaf-version}/xml/features</repository>
|
||||
|
||||
<feature name="activemq" version="${activemq-version}">
|
||||
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
|
||||
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
|
||||
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
|
||||
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
|
||||
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
|
||||
|
@ -13,7 +13,8 @@
|
|||
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.activemq/activemq-karaf/${activemq-version}</bundle>
|
||||
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>activemq-ra</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.components</groupId>
|
||||
<artifactId>geronimo-transaction</artifactId>
|
||||
|
@ -71,7 +71,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-annotation_1.1_spec</artifactId>
|
||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
<properties>
|
||||
<activemq.osgi.import.pkg>
|
||||
javax.resource*;resolution:=optional,
|
||||
*
|
||||
</activemq.osgi.import.pkg>
|
||||
<activemq.osgi.export>
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-annotation_1.1_spec</artifactId>
|
||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
Loading…
Reference in New Issue