[jboss-cvs] JBossAS SVN: r61438 - in projects/microcontainer/trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 19 09:53:06 EDT 2007
Author: pgier
Date: 2007-03-19 09:53:06 -0400 (Mon, 19 Mar 2007)
New Revision: 61438
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/dependency/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
Log:
JBMICROCONT-117; Moved intermodule dependencies up to the microcontainer parent.
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -12,23 +12,6 @@
<name>JBoss Microcontainer AOP MC INT</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer</description>
- <build>
- <plugins>
- <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
- The configuration for this plugin is specified in the parent pom. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<!-- Global dependencies -->
<dependency>
@@ -44,22 +27,19 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
+ <version>1.0.3.GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -75,7 +55,6 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/build/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -61,7 +61,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <printSummary>false</printSummary>
<testFailureIgnore>true</testFailureIgnore>
<includes>
<include>**/*TestCase.java</include>
@@ -137,6 +136,7 @@
</plugins>
</reporting>
<dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
<dependency>
<groupId>jboss</groupId>
@@ -150,6 +150,13 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${project.version}</version>
</dependency>
@@ -165,6 +172,13 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-managed</artifactId>
<version>${project.version}</version>
</dependency>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/container/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -55,7 +55,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -31,7 +31,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/AbstractDependencyTest*</exclude>
<exclude>**/TestControllerContext*</exclude>
@@ -52,7 +51,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -62,10 +61,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
</project>
Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/deployers/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -49,23 +49,20 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-managed</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/kernel/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -45,17 +45,15 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/managed/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -39,12 +39,10 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-metatype</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/metatype/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -35,7 +35,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/osgi-int/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -46,7 +46,6 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2007-03-19 13:29:00 UTC (rev 61437)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2007-03-19 13:53:06 UTC (rev 61438)
@@ -11,24 +11,7 @@
<packaging>jar</packaging>
<name>JBoss Microcontainer Spring Int</name>
<url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Spring Int</description>
- <build>
- <plugins>
- <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
- The configuration for this plugin is specified in the parent pom. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <description>JBoss Microcontainer Spring Integration</description>
<dependencies>
<!-- Global dependencies -->
<dependency>
@@ -39,19 +22,17 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
More information about the jboss-cvs-commits
mailing list