Author: rmannibucau
Date: Sun Jun 3 23:24:09 2012
New Revision: 1345802
URL: http://svn.apache.org/viewvc?rev=1345802&view=rev
Log:
adding some deps to karaf feature to get a build order and replacing a maven
proeprty which was no more existing
Modified:
openejb/branches/openejb-4.0.x/osgi/openejb-feature/pom.xml
openejb/branches/openejb-4.0.x/osgi/openejb-feature/src/main/feature/feature.xml
Modified: openejb/branches/openejb-4.0.x/osgi/openejb-feature/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/osgi/openejb-feature/pom.xml?rev=1345802&r1=1345801&r2=1345802&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.x/osgi/openejb-feature/pom.xml (original)
+++ openejb/branches/openejb-4.0.x/osgi/openejb-feature/pom.xml Sun Jun 3
23:24:09 2012
@@ -29,6 +29,34 @@
<name>OpenEJB :: OSGi :: Feature</name>
<packaging>pom</packaging>
+ <!-- deps just to force the build of used artifacts before osgi module -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core-osgi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-karaf-commands</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-client</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
Modified:
openejb/branches/openejb-4.0.x/osgi/openejb-feature/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.x/osgi/openejb-feature/src/main/feature/feature.xml?rev=1345802&r1=1345801&r2=1345802&view=diff
==============================================================================
---
openejb/branches/openejb-4.0.x/osgi/openejb-feature/src/main/feature/feature.xml
(original)
+++
openejb/branches/openejb-4.0.x/osgi/openejb-feature/src/main/feature/feature.xml
Sun Jun 3 23:24:09 2012
@@ -92,7 +92,7 @@
<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="${xbean.version}">xbean</feature>
<feature version="${geronimo-osgi.version}">geronimo-osgi</feature>
<feature
version="${org.apache.openwebbeans.version}">org.apache.openwebbeans</feature>
<feature version="${openjpa.version}">openjpa</feature>
