[jboss-cvs] JBossAS SVN: r96804 - in projects/jboss-osgi/trunk/reactor/deployment: .settings and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-11-24 06:17:29 -0500 (Tue, 24 Nov 2009)
New Revision: 96804

Modified:
   projects/jboss-osgi/trunk/reactor/deployment/.classpath
   projects/jboss-osgi/trunk/reactor/deployment/.settings/org.eclipse.jdt.core.prefs
   projects/jboss-osgi/trunk/reactor/deployment/pom.xml
Log:
Prepare to move out of reactor

Modified: projects/jboss-osgi/trunk/reactor/deployment/.classpath
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/.classpath	2009-11-24 10:16:59 UTC (rev 96803)
+++ projects/jboss-osgi/trunk/reactor/deployment/.classpath	2009-11-24 11:17:29 UTC (rev 96804)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: projects/jboss-osgi/trunk/reactor/deployment/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/.settings/org.eclipse.jdt.core.prefs	2009-11-24 10:16:59 UTC (rev 96803)
+++ projects/jboss-osgi/trunk/reactor/deployment/.settings/org.eclipse.jdt.core.prefs	2009-11-24 11:17:29 UTC (rev 96804)
@@ -1,5 +1,6 @@
-#Fri Oct 16 10:23:39 CEST 2009
+#Tue Nov 24 12:10:53 CET 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.5

Modified: projects/jboss-osgi/trunk/reactor/deployment/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/pom.xml	2009-11-24 10:16:59 UTC (rev 96803)
+++ projects/jboss-osgi/trunk/reactor/deployment/pom.xml	2009-11-24 11:17:29 UTC (rev 96804)
@@ -25,12 +25,14 @@
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
-    <version>1.0.0.Beta5</version>
+    <artifactId>jboss-osgi-parent</artifactId>
+    <version>1.0.4</version>
   </parent>
 
   <properties>
     <version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
+    <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+    <version.osgi>4.2.0</version.osgi>
   </properties>
 
   <!-- Dependencies -->
@@ -42,6 +44,7 @@
     <dependency>
       <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-spi</artifactId>
+      <version>${version.jboss.osgi.spi}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.deployers</groupId>
@@ -53,14 +56,16 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
+      <version>${version.osgi}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
+      <version>${version.osgi}</version>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- Test Dependecies -->
     <dependency>
       <groupId>junit</groupId>
@@ -119,6 +124,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${project.build.directory}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
     </plugins>
   </build>