[jboss-cvs] JBossAS SVN: r61560 - in projects/microcontainer/trunk: aop-mc-int and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 21 20:47:48 EDT 2007
Author: pgier
Date: 2007-03-21 20:47:48 -0400 (Wed, 21 Mar 2007)
New Revision: 61560
Added:
projects/microcontainer/trunk/pom.xml
Removed:
projects/microcontainer/trunk/build/pom.xml
Modified:
projects/microcontainer/trunk/aop-mc-int/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/spring-int/pom.xml
Log:
JBMICROCONT-117; Moved the parent pom to the root folder of the project instead of the build directory.
The eclipse plugin seems to like this better, and this way the parent path does not have to be specified
in the sub-project poms.
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-mc-int</artifactId>
Deleted: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/build/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The parent maven for the microcontainer project that expects a structure like:
- build/pom.xml
- aop-mc-int/pom.xml
- container/pom.xml
- dependency/pom.xml
- deployers/pom.xml
- kernel/pom.xml
- managed/pom.xml
- metatype/pom.xml
- spring-int/pom.xml
-
- This pom aggregates the subproject pom, and it also functions as a default configuration. The subproject
- poms each inherit configuration from this one.
-
- To build this project maven 2 should be installed and in the system path. From the command line
- run "mvn" from the build directory and "install" will be used as the default goal. In order to use
- the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
--->
-<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">
- <parent>
- <groupId>jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Microcontainer Build</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>
- The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
- and configuration.
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/</connection>
- <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>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>jboss.maven-plugins</groupId>
- <artifactId>jboss-retro-maven-plugin</artifactId>
- <version>0.5-beta</version>
- <executions>
- <execution>
- <goals>
- <goal>retro-compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>jboss.maven-plugins</groupId>
- <artifactId>jboss-deploy-maven-plugin</artifactId>
- <version>1.1-beta</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <modules>
- <module>../container</module>
- <module>../dependency</module>
- <module>../kernel</module>
- <module>../aop-mc-int</module>
- <module>../metatype</module>
- <module>../managed</module>
- <module>../deployers</module>
- </modules>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </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>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-deployers</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-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>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-spring-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/container/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -5,7 +5,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-container</artifactId>
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-dependency</artifactId>
Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/deployers/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-deployers</artifactId>
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/kernel/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-kernel</artifactId>
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/managed/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-managed</artifactId>
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/metatype/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-metatype</artifactId>
Copied: projects/microcontainer/trunk/pom.xml (from rev 61555, projects/microcontainer/trunk/build/pom.xml)
===================================================================
--- projects/microcontainer/trunk/pom.xml (rev 0)
+++ projects/microcontainer/trunk/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The parent maven for the microcontainer project that expects a structure like:
+ build/pom.xml
+ aop-mc-int/pom.xml
+ container/pom.xml
+ dependency/pom.xml
+ deployers/pom.xml
+ kernel/pom.xml
+ managed/pom.xml
+ metatype/pom.xml
+ spring-int/pom.xml
+
+ This pom aggregates the subproject pom, and it also functions as a default configuration. The subproject
+ poms each inherit configuration from this one.
+
+ To build this project maven 2 should be installed and in the system path. From the command line
+ run "mvn" from the build directory and "install" will be used as the default goal. In order to use
+ the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
+-->
+<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">
+ <parent>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Build</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>
+ The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
+ and configuration.
+ </description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/</connection>
+ <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>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-retro-maven-plugin</artifactId>
+ <version>0.5-beta</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>retro-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-deploy-maven-plugin</artifactId>
+ <version>1.1-beta</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.com/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <modules>
+ <module>container</module>
+ <module>dependency</module>
+ <module>kernel</module>
+ <module>aop-mc-int</module>
+ <module>metatype</module>
+ <module>managed</module>
+ <module>deployers</module>
+ </modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ </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>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-deployers</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-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>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-spring-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2007-03-21 23:53:17 UTC (rev 61559)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2007-03-22 00:47:48 UTC (rev 61560)
@@ -4,7 +4,6 @@
<groupId>jboss</groupId>
<artifactId>jboss-microcontainer</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-spring-int</artifactId>
More information about the jboss-cvs-commits
mailing list