[portal-commits] JBoss Portal SVN: r13865 - in modules/web/trunk: build and 1 other directories.
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 06:57:52 -0500 (Fri, 11 Dec 2009)
New Revision: 13865
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/pom.xml
modules/web/trunk/web/pom.xml
Log:
Updates
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/build/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -26,21 +26,20 @@
<properties>
<version.concurrent>1.3.4</version.concurrent>
- <version.sun.servlet>2.4</version.sun.servlet>
+ <version.sun.servlet>2.5</version.sun.servlet>
<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.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.2</version.jboss.portal.common>
- <version.jboss.unit>1.2.1</version.jboss.unit>
+ <version.jboss-remoting>2.2.2.SP8</version.jboss-remoting>
+ <version.jboss.portal.common>1.2.5</version.jboss.portal.common>
+ <version.jboss.unit>1.2.3</version.jboss.unit>
<version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect>
- <version.log4j>1.2.14</version.log4j>
- <version.apache.commons-logging>1.1.1</version.apache.commons-logging>
+
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
<version.cargo>1.0-alpha-6</version.cargo>
- <version.junit>3.8.1</version.junit>
+ <version.junit>3.8.2-brew</version.junit>
<version.ant>1.7.0</version.ant>
</properties>
@@ -114,7 +113,7 @@
<version>${version.jboss.portal.common}</version>
</dependency>
<dependency>
- <groupId>sun-servlet</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.sun.servlet}</version>
</dependency>
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/web/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>sun-servlet</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>