[jboss-cvs] JBossAS SVN: r64002 - in projects/microcontainer/trunk: build and 22 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jul 12 14:16:44 EDT 2007


Author: kevin.conner at jboss.com
Date: 2007-07-12 14:16:44 -0400 (Thu, 12 Jul 2007)
New Revision: 64002

Added:
   projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.properties
Modified:
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/classloader/pom.xml
   projects/microcontainer/trunk/container/pom.xml
   projects/microcontainer/trunk/dependency/pom.xml
   projects/microcontainer/trunk/deployers-client-spi/pom.xml
   projects/microcontainer/trunk/deployers-client/pom.xml
   projects/microcontainer/trunk/deployers-core-spi/pom.xml
   projects/microcontainer/trunk/deployers-core/pom.xml
   projects/microcontainer/trunk/deployers-impl/pom.xml
   projects/microcontainer/trunk/deployers-spi/pom.xml
   projects/microcontainer/trunk/deployers-structure-spi/pom.xml
   projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
   projects/microcontainer/trunk/deployers-vfs/pom.xml
   projects/microcontainer/trunk/deployers/pom.xml
   projects/microcontainer/trunk/kernel/pom.xml
   projects/microcontainer/trunk/managed/pom.xml
   projects/microcontainer/trunk/metatype/pom.xml
   projects/microcontainer/trunk/osgi-int/pom.xml
   projects/microcontainer/trunk/spring-int/pom.xml
   projects/microcontainer/trunk/varia/
   projects/microcontainer/trunk/varia/osgi-api/
   projects/microcontainer/trunk/varia/osgi-api/repository/pom.xml
Log:
Consolidated poms, changed maven test classes directory, added classloader perms

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -173,12 +173,28 @@
       </plugin>
     </plugins>
   </build>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-test</artifactId>
+        <version>${version.jboss.test}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${version.junit}</version>
+        <scope>compile</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-aop</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.microcontainer</groupId>
@@ -208,21 +224,22 @@
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
+      <artifactId>jbossxb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbossxb</artifactId>
-      <version>2.0.0.CR3</version>
-    </dependency>
-    <!-- Test dependencies -->
-    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
       <type>test-jar</type>
@@ -417,7 +434,6 @@
               <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-junit</artifactId>
-                <version>1.7.0</version>
               </dependency>
             </dependencies>     
           </plugin>
@@ -495,7 +511,6 @@
               <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-junit</artifactId>
-                <version>1.7.0</version>
               </dependency>
             </dependencies>     
           </plugin>

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/build/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -2,6 +2,11 @@
 <!--
   This pom functions as a default configuration.  The subproject
   poms each inherit configuration from this one.
+
+  When adding version information for an artifact please do the following
+  - add a version property for the specific version
+  - add a dependency in the dependencyManagement section which refers to
+    the property
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -26,6 +31,22 @@
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/trunk/</developerConnection>
     <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/trunk/</url>
   </scm>
+  
+  <properties>
+    <version.jboss.common.core>2.0.4.GA</version.jboss.common.core>
+    <version.jbossxb>2.0.0.CR3</version.jbossxb>
+    <version.osgi.r4.core>1.0</version.osgi.r4.core>
+    <version.jboss.vfs>2.0.4.snapshot</version.jboss.vfs>
+    <version.javassist>3.6-beta</version.javassist>
+    <version.jaxb.api>2.0</version.jaxb.api>
+    <version.jboss.aop>2.0.0-SNAPSHOT</version.jboss.aop>
+    <version.jboss.logging.spi>2.0.3.GA</version.jboss.logging.spi>
+    <version.jboss.test>1.0.4-SNAPSHOT</version.jboss.test>
+    <version.junit>3.8.1</version.junit>
+    <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
+    <version.ant.junit>1.7.0</version.ant.junit>
+  </properties>
+
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <testSourceDirectory>src/tests</testSourceDirectory>
@@ -308,23 +329,67 @@
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
-        <version>2.0.4.GA</version>
+        <version>${version.jboss.common.core}</version>
       </dependency>
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jbossxb</artifactId>
-        <version>2.0.0.CR3</version>
+        <version>${version.jbossxb}</version>
       </dependency>
       <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi_R4_core</artifactId>
+        <version>${version.osgi.r4.core}</version>
+      </dependency>
+      <dependency>
         <groupId>jboss</groupId>
-        <artifactId>jboss-common-core</artifactId>
-        <version>2.0.4.GA</version>
+        <artifactId>jboss-vfs</artifactId>
+        <version>${version.jboss.vfs}</version>
       </dependency>
       <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi_R4_core</artifactId>
-        <version>1.0</version>
+        <groupId>org.jboss</groupId>
+        <artifactId>javassist</artifactId>
+        <version>${version.javassist}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>${version.jaxb.api}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-aop</artifactId>
+        <version>${version.jboss.aop}</version>
+      </dependency>
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-logging-spi</artifactId>
+        <version>${version.jboss.logging.spi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-junit</artifactId>
+        <version>${version.ant.junit}</version>
+      </dependency>
+      <!-- test dependencies -->
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-test</artifactId>
+        <version>${version.jboss.test}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${version.junit}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>jboss.profiler.jvmti</groupId>
+        <artifactId>jboss-profiler-jvmti</artifactId>
+        <version>${version.jboss.profiler.jvmti}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   
@@ -336,7 +401,7 @@
       </activation>
       <properties>
         <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
-        <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
+        <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory>
       </properties>
     </profile>
     <profile>

Modified: projects/microcontainer/trunk/classloader/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloader/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/classloader/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -18,25 +18,25 @@
       </testResource>
     </testResources>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>jboss-common-core</artifactId>
-	    <version>2.0.4.GA</version>
 	  </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>

Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/container/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -60,48 +60,37 @@
       </plugin>
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
-      <!--
-        included to resolve different transitive dependencies from
-        jboss-vfs and jbossxb
-      -->
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-    </dependency>
-    <dependency>
-	    <groupId>javassist</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-vfs</artifactId>
-      <version>2.0.4.snapshot</version>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jbossxb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jboss.profiler.jvmti</groupId>
       <artifactId>jboss-profiler-jvmti</artifactId>
-      <version>1.0.0.CR5</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/dependency/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -42,24 +42,25 @@
       </plugin>
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
 	  </dependency>
   </dependencies>
 </project>

Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -30,6 +30,7 @@
       </plugin>
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>

Modified: projects/microcontainer/trunk/deployers-client/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-client/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -26,6 +26,7 @@
       </plugin>	   	   
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -36,14 +37,10 @@
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
     <dependency>
     <groupId>org.jboss.microcontainer</groupId>

Modified: projects/microcontainer/trunk/deployers-client-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-client-spi/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,6 +11,7 @@
   <name>JBoss Deployers Client SPI</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Deployers Client SPI</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>

Modified: projects/microcontainer/trunk/deployers-core/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-core/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -26,6 +26,7 @@
       </plugin>	   	   
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -35,20 +36,15 @@
     <dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>jboss-common-core</artifactId>
-	    <version>2.0.4.GA</version>
 	  </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>

Modified: projects/microcontainer/trunk/deployers-core-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-core-spi/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,4 +11,5 @@
   <name>JBoss Deployers Core SPI</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Deployers Core SPI</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
 </project>

Modified: projects/microcontainer/trunk/deployers-impl/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-impl/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-impl/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -26,6 +26,7 @@
       </plugin>	   	   
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -40,18 +41,18 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>

Modified: projects/microcontainer/trunk/deployers-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-spi/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-spi/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,11 +11,16 @@
   <name>JBoss Deployers SPI</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Deployers SPI</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
   </dependencies>  
 </project>

Modified: projects/microcontainer/trunk/deployers-structure-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-structure-spi/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -26,24 +26,25 @@
       </plugin>	   	   
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-deployers-client-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>

Modified: projects/microcontainer/trunk/deployers-vfs/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-vfs/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -18,6 +18,7 @@
       </testResource>
     </testResources>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -40,18 +41,18 @@
       <groupId>org.jboss.microcontainer</groupId>
 	    <artifactId>jboss-deployers-impl</artifactId>
 	 </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>

Modified: projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/deployers-vfs-spi/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,6 +11,7 @@
   <name>JBoss Deployers VFS SPI</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Deployers VFS SPI</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -24,7 +25,10 @@
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
-      <version>2.0</version>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
   </dependencies>  
 </project>

Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/kernel/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -52,6 +52,23 @@
       </plugin>
     </plugins>
   </build>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-test</artifactId>
+        <version>${version.jboss.test}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${version.junit}</version>
+        <scope>compile</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -65,7 +82,6 @@
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
@@ -74,11 +90,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <!-- Note: JUnit is required for the main classes, so it is not actually in the test -->
-      <!--   scope.  Maybe these dependencies can be changed. --> 
-      <!--<scope>test</scope>-->
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
   </dependencies>
 </project>

Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.properties
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.properties	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.properties	2007-07-12 18:16:44 UTC (rev 64002)
@@ -0,0 +1 @@
+test.Permission.1=java.lang.RuntimePermission, getClassLoader
\ No newline at end of file


Property changes on: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/managed/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -24,12 +24,12 @@
       </plugin>
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-aop</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
@@ -39,18 +39,18 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-metatype</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/metatype/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,6 +11,7 @@
   <name>JBoss Microcontainer Metatype</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer Metatype</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -20,20 +21,15 @@
     <dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>jboss-common-core</artifactId>
-	    <version>2.0.4.GA</version>
 	  </dependency>
 	  <!-- Test dependencies -->
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
-	    <version>3.8.1</version>
-	    <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>

Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/osgi-int/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -50,6 +50,7 @@
       </plugin>
     </plugins>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -63,20 +64,19 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>osgi_R4_core</artifactId>
-      <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
     <!-- Test dependencies -->
      <dependency>
        <groupId>jboss</groupId>
        <artifactId>jboss-test</artifactId>
-       <version>1.0.3.GA</version>
-       <scope>test</scope>
      </dependency>
      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>3.8.1</version>
-        <scope>test</scope>
      </dependency>
   </dependencies>
 </project>

Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/spring-int/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -23,6 +23,7 @@
       </testResource>
     </testResources>
   </build>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <!-- Global dependencies -->
     <dependency>
@@ -37,8 +38,6 @@
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.3.GA</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>


Property changes on: projects/microcontainer/trunk/varia
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/microcontainer/trunk/varia/osgi-api
___________________________________________________________________
Name: svn:ignore
   + target


Modified: projects/microcontainer/trunk/varia/osgi-api/repository/pom.xml
===================================================================
--- projects/microcontainer/trunk/varia/osgi-api/repository/pom.xml	2007-07-12 17:51:38 UTC (rev 64001)
+++ projects/microcontainer/trunk/varia/osgi-api/repository/pom.xml	2007-07-12 18:16:44 UTC (rev 64002)
@@ -11,6 +11,7 @@
   <name>JBoss OSGi Repository API</name>
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss OSGi Repository API</description>
+  <!-- Do not add version information here, use ../build/pom.xml instead -->
   <dependencies>
     <dependency>
       <groupId>org.osgi</groupId>




More information about the jboss-cvs-commits mailing list