You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2011/12/21 11:30:05 UTC
svn commit: r1221665 - in /openejb/trunk/openejb:
container/openejb-osgi/src/main/filtered-resources/features.xml pom.xml
Author: jlmonteiro
Date: Wed Dec 21 10:30:05 2011
New Revision: 1221665
URL: http://svn.apache.org/viewvc?rev=1221665&view=rev
Log:
Update OSGi feature
Modified:
openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml
openejb/trunk/openejb/pom.xml
Modified: openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml?rev=1221665&r1=1221664&r2=1221665&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml (original)
+++ openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml Wed Dec 21 10:30:05 2011
@@ -20,6 +20,7 @@
<features>
<repository>mvn:org.apache.openejb/javaee-api/${javaee-api.version}/xml/features</repository>
<repository>mvn:org.apache.openejb/openejb-core-osgi/${project.version}/xml/features</repository>
+ <repository>mvn:org.apache.activemq/activemq-karaf/${org.apache.activemq.version}/xml/features</repository>
<feature name="org.apache.commons">
<bundle>mvn:commons-cli/commons-cli/${commons-cli.version}</bundle>
@@ -57,13 +58,6 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-locator/${geronimo-osgi.version}</bundle>
</feature>
- <feature name="org.apache.activemq" version="${org.apache.activemq.version}">
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
- <bundle>mvn:org.apache.activemq/activemq-core/${org.apache.activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/kahadb/${org.apache.activemq.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-ra/${org.apache.activemq.version}</bundle>
- </feature>
-
<feature name="openejb-core" version="${project.version}">
<feature version="${javaee-api.version}">javaee-api</feature>
@@ -75,13 +69,15 @@
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-transaction/${geronimo.connector.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo-javamail_1.4_spec.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3-1_1</bundle>
<feature>org.apache.commons</feature>
<feature version="${xbeanVersion}">xbean</feature>
<feature version="${geronimo-osgi.version}">geronimo-osgi</feature>
<feature version="${org.apache.openwebbeans.version}">org.apache.openwebbeans</feature>
- <feature version="${org.apache.activemq.version}">org.apache.activemq</feature>
+ <feature version="${org.apache.activemq.version}">activemq</feature>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.bval/org.apache.bval.bundle/${bval.version}</bundle>
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1221665&r1=1221664&r2=1221665&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Wed Dec 21 10:30:05 2011
@@ -132,6 +132,7 @@
<org.apache.openwebbeans.version>1.1.1</org.apache.openwebbeans.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
+ <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
<myfaces.version>2.1.2</myfaces.version>
<slf4j.version>1.6.1</slf4j.version>
<log4j.version>1.2.16</log4j.version>