[jboss-osgi-commits] JBoss-OSGI SVN: r99660 - in projects/jboss-osgi/trunk: reactor/blueprint and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2010-01-20 09:49:31 -0500 (Wed, 20 Jan 2010)
New Revision: 99660
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml
Log:
[JBOSGI-263] Integrate Aries Blueprint implementation
org.apache.aries.blueprint-1.0.0.20100120
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-01-20 14:43:05 UTC (rev 99659)
+++ projects/jboss-osgi/trunk/pom.xml 2010-01-20 14:49:31 UTC (rev 99660)
@@ -44,8 +44,8 @@
<!-- Properties -->
<properties>
<version.apache.ant>1.7.0</version.apache.ant>
-
<version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint>
-
<version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util>
+
<version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>
+ <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util>
<version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin>
<version.apache.felix.core>1.4.0</version.apache.felix.core>
<version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2010-01-20 14:43:05 UTC (rev
99659)
+++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2010-01-20 14:49:31 UTC (rev
99660)
@@ -41,17 +41,17 @@
<artifactId>bnd</artifactId>
</dependency>
- <!-- Compile Dependencies -->
+ <!-- Provided Dependencies -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <scope>provided</scope>
</dependency>
-
- <!-- Provided Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2010-01-20
14:43:05 UTC (rev 99659)
+++ projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2010-01-20
14:49:31 UTC (rev 99660)
@@ -14,22 +14,13 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:org.apache.aries.blueprint:jar</include>
- <include>*:org.apache.aries.util:jar</include>
- </includes>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>compile</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bundles</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-husky:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
+ <include>*:org.apache.aries.blueprint:jar</include>
+ <include>*:org.apache.aries.util:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>