6:26 p.m.
Author: aheritier
Date: 2009-08-30 19:26:59 -0400 (Sun, 30 Aug 2009)
New Revision: 138
Modified:
components/wci/trunk/build/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/wci/pom.xml
Log:
Cleanup (Maven)
Modified: components/wci/trunk/build/pom.xml
===================================================================
--- components/wci/trunk/build/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/build/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -18,21 +18,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Portal Test Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Portal Web Module</description>
+ <name>GateIn - Web Container Integration component (parent)</name>
<properties>
<version.concurrent>1.3.4</version.concurrent>
- <version.sun.servlet>2.5</version.sun.servlet>
+ <version.servlet.api>2.5</version.servlet.api>
<version.apache.tomcat>6.0.16</version.apache.tomcat>
<version.jetty>6.1.7</version.jetty>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
<version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
-
<version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common>
+ <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
<version.jboss.unit>1.2.2</version.jboss.unit>
<version.jboss-reflect>2.0.2.GA</version.jboss-reflect>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
@@ -117,17 +115,17 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-mc</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${version.sun.servlet}</version>
+ <version>${version.servlet.api}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -1,21 +1,20 @@
-<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">
+<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.wci</groupId>
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Web Module</name>
- <version>3.0.0-SNAPSHOT</version>
+ <name>GateIn - Web Container Integration component (aggregator)</name>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
- <dependencies/>
+ <dependencies />
<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>
+ <!-- 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>
@@ -33,38 +32,38 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
</plugin>
</plugins>
- </reporting>
+ </reporting>
-<build>
-<plugins>
-<plugin>
-<groupId>org.apache.maven.plugins</groupId>
-<artifactId>maven-surefire-plugin</artifactId>
-</plugin>
-<plugin>
-<groupId>org.apache.maven.plugins</groupId>
-<artifactId>maven-surefire-report-plugin</artifactId>
-<configuration>
-<!--<outputDirectory>/data/reports</outputDirectory>-->
-<aggregate>true</aggregate>
-</configuration>
-<executions>
-<execution>
-<phase>test</phase>
-<goals>
-<goal>report-only</goal>
-</goals>
-</execution>
-</executions>
-</plugin>
-</plugins>
-</build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <!--<outputDirectory>/data/reports</outputDirectory>-->
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/wci/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
<packaging>jar</packaging>
- <name>JBoss Unit</name>
+ <name>GateIn - Web Container Integration component (wci)</name>
<dependencies>
@@ -35,6 +35,12 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -228,7 +234,7 @@
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
<property name="dependency.cargo-manager.war"
value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <!-- JBoss Portal -->
+ <!-- GateIn -->
<property name="dependency.gatein-common-common.jar"
value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
<property name="dependency.gatein-common-mc.jar"
value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>