Author: mpodolin Date: 2009-09-29 09:49:42 -0400 (Tue, 29 Sep 2009) New Revision: 212 Modified: components/pc/trunk/api/pom.xml components/pc/trunk/bridge/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/docs/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/jsr168api/pom.xml components/pc/trunk/management/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/samples/pom.xml components/pc/trunk/test/pom.xml Log: Maven configurating refactored. Modified: components/pc/trunk/api/pom.xml =================================================================== --- components/pc/trunk/api/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/api/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> @@ -21,6 +20,7 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> + <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> @@ -28,7 +28,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> </dependencies> Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/bridge/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-bridge</artifactId> @@ -15,7 +14,6 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.portals.bridges</groupId> @@ -23,5 +21,4 @@ </dependency> </dependencies> - </project> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/controller/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-controller</artifactId> @@ -12,11 +11,10 @@ <name>GateIn - Portlet Container (controller)</name> <dependencies> - + <!-- Internal dependencies --> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> <type>jar</type> </dependency> @@ -31,7 +29,6 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> Modified: components/pc/trunk/docs/pom.xml =================================================================== --- components/pc/trunk/docs/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/docs/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -3,9 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/federation/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-federation</artifactId> @@ -15,7 +14,6 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> @@ -28,7 +26,6 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> Modified: components/pc/trunk/jsr168api/pom.xml =================================================================== --- components/pc/trunk/jsr168api/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/jsr168api/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-jsr168api</artifactId> Modified: components/pc/trunk/management/pom.xml =================================================================== --- components/pc/trunk/management/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/management/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-management</artifactId> @@ -15,7 +14,6 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> </dependencies> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/mc/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-mc</artifactId> @@ -15,8 +14,8 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -1,107 +1,204 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.pc</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>GateIn - Portlet Container (aggregator)</name> - <version>2.1.0-SNAPSHOT</version> + + <modelVersion>4.0.0</modelVersion> + + <name>GateIn - Portlet Container</name> + + <groupId>org.gatein.pc</groupId> + <artifactId>pc-parent</artifactId> + <version>2.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <parent> + <groupId>org.gatein</groupId> + <artifactId>gatein-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... + <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</ur... + </scm> + + <properties> + <version.gatein.common>2.0.0-Beta02</version.gatein.common> + <version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci> + </properties> + + <dependencyManagement> + <dependencies> + <!-- Import dependency management configuration --> + <dependency> + <groupId>org.gatein</groupId> + <artifactId>gatein-dep</artifactId> + <version>1.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Internal dependencies --> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${version.gatein.common}</version> + </dependency> - <distributionManagement> - <repository> - <!-- Copy the distribution jar file to a local checkout of the maven repository --> - <!-- This variable can be set in $MAVEN_HOME/conf/settings.xml --> - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - <uniqueVersion>true</uniqueVersion> - </snapshotRepository> - </distributionManagement> - - <profiles> - <profile> - <id>default</id> - <modules> - <module>build</module> - <module>api</module> - <module>jsr168api</module> - <module>portlet</module> - <module>controller</module> - <module>bridge</module> - <module>federation</module> - <module>management</module> - <module>mc</module> - <module>test</module> - <module>portal</module> - <module>samples</module> - <module>docs</module> - </modules> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>docs</id> - <modules> - <module>docs</module> - </modules> - </profile> - <profile> - <id>test</id> - <modules> - <module>build</module> - <module>api</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>test</module> - </modules> - </profile> - <profile> - <id>portal</id> - <modules> - <module>build</module> - <module>api</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>portal</module> - <module>samples</module> - </modules> - </profile> - <profile> - <id>release</id> - <modules> - <module>build</module> - <module>api</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>portal</module> - <module>samples</module> - <module>docs</module> - </modules> - </profile> - </profiles> - - <modules> - </modules> - - <reporting> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <version>${version.gatein.common}</version> + </dependency> + + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${version.gatein.wci}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + <configuration> + <archive> + <manifest> + <addClasspath>false</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + <pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> + <plugin> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-maven2</artifactId> + <version>1.2.1</version> + </plugin> </plugins> - </reporting> - - + </pluginManagement> + </build> + + <profiles> + <profile> + <id>default</id> + <modules> + <module>api</module> + <module>jsr168api</module> + <module>portlet</module> + <module>controller</module> + <module>bridge</module> + <module>federation</module> + <module>management</module> + <module>mc</module> + <module>test</module> + <module>portal</module> + <module>samples</module> + <module>docs</module> + </modules> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>docs</id> + <modules> + <module>docs</module> + </modules> + </profile> + <profile> + <id>test</id> + <modules> + <module>api</module> + <module>portlet</module> + <module>controller</module> + <module>mc</module> + <module>test</module> + </modules> + </profile> + <profile> + <id>portal</id> + <modules> + <module>api</module> + <module>portlet</module> + <module>controller</module> + <module>mc</module> + <module>portal</module> + <module>samples</module> + </modules> + </profile> + <profile> + <id>release</id> + <modules> + <module>api</module> + <module>portlet</module> + <module>controller</module> + <module>mc</module> + <module>portal</module> + <module>samples</module> + <module>docs</module> + </modules> + </profile> + </profiles> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + </project> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/portal/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portal</artifactId> @@ -26,28 +25,23 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <type>jar</type> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-controller</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-mc</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/portlet/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portlet</artifactId> @@ -12,17 +11,9 @@ <name>GateIn - Portlet Container (pc)</name> <dependencies> - <!-- - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-jsr168api</artifactId> - <version>${project.version}</version> - </dependency> - --> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>javax.portlet</groupId> Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/samples/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-samples</artifactId> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-09-29 13:23:55 UTC (rev 211) +++ components/pc/trunk/test/pom.xml 2009-09-29 13:49:42 UTC (rev 212) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.pc</groupId> - <artifactId>module-parent</artifactId> + <artifactId>pc-parent</artifactId> <version>2.1.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-test</artifactId> @@ -26,29 +25,24 @@ <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> <type>test-jar</type> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-controller</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-mc</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> @@ -151,7 +145,6 @@ <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> <scope>test</scope> </dependency> <dependency> @@ -160,12 +153,8 @@ <type>war</type> <scope>test</scope> </dependency> + <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <type>jar</type> - </dependency> - <dependency> <groupId>javax.ccpp</groupId> <artifactId>ccpp</artifactId> </dependency>