[jboss-cvs] JBossAS SVN: r91159 - in projects/jboss-osgi: trunk and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-07-13 09:50:14 -0400 (Mon, 13 Jul 2009)
New Revision: 91159

Added:
   projects/jboss-osgi/trunk/modules/
   projects/jboss-osgi/trunk/modules/spi/
Removed:
   projects/jboss-osgi/projects/spi/trunk/
Modified:
   projects/jboss-osgi/trunk/modules/spi/pom.xml
   projects/jboss-osgi/trunk/pom.xml
Log:
Move SPI to reactor build

Copied: projects/jboss-osgi/trunk/modules/spi (from rev 91154, projects/jboss-osgi/projects/spi/trunk)

Modified: projects/jboss-osgi/trunk/modules/spi/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml	2009-07-13 11:46:11 UTC (rev 91154)
+++ projects/jboss-osgi/trunk/modules/spi/pom.xml	2009-07-13 13:50:14 UTC (rev 91159)
@@ -8,23 +8,20 @@
   <artifactId>jboss-osgi-spi</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.0.0-SNAPSHOT</version>
+  <version>${version.jboss.osgi.spi}</version>
   
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <artifactId>jboss-osgi</artifactId>
+    <version>1.0.0.Beta3</version>
   </parent>
 
   <!-- Properties -->
   <properties>
-    <version.args4j>2.0.12</version.args4j>
 	<version.jboss.deployers>2.0.5.SP1</version.jboss.deployers>
     <version.jboss.logging>2.0.5.GA</version.jboss.logging>
     <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
-    <version.junit>4.6</version.junit>
-    <version.osgi>r4v41</version.osgi>
   </properties>
   
   <!-- Dependencies -->

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-07-13 13:43:41 UTC (rev 91158)
+++ projects/jboss-osgi/trunk/pom.xml	2009-07-13 13:50:14 UTC (rev 91159)
@@ -16,11 +16,6 @@
     <version>1.0.1-SNAPSHOT</version>
   </parent>
 
-  <!-- Modules -->
-  <modules>
-    <module>testsuite</module>
-  </modules>
-
   <!-- Properties -->
   <properties>
     <!-- 
@@ -53,7 +48,8 @@
     <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.webconsole>1.0.0-SNAPSHOT</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding>
-
+    <version.osgi>r4v41</version.osgi>
+    
     <!-- Properties for test dependencies -->
     <version.jboss.logging>2.0.5.GA</version.jboss.logging>
     <version.junit>4.6</version.junit>
@@ -203,6 +199,16 @@
         <version>${version.jboss.osgi.xml.binding}</version>
       </dependency>
       <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${version.osgi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>${version.osgi}</version>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${version.junit}</version>
@@ -284,6 +290,18 @@
         </plugins>
       </build>
     </profile>
+    
+    <!--
+      Name: reactor
+      Desc: Build the dependent modules and run the integration testsuite
+    -->
+    <profile>
+      <id>reactor</id>
+      <modules>
+        <module>modules/spi</module>
+        <module>testsuite</module>
+      </modules>
+    </profile>
   </profiles>
 
 </project>