gatein SVN: r6021 - in components/pc/trunk: api and 19 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 16:19:47 -0400 (Mon, 14 Mar 2011)
New Revision: 6021
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/docs/user-guide/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/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-Beta01
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/api/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/bridge/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/controller/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/docs/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/federation/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/jsr168api/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/management/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/mc/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<packaging>pom</packaging>
<parent>
@@ -39,9 +39,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Be...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Beta01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta01</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/portal/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/portlet/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/samples/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/core/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:19:47 UTC (rev 6021)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta01</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
13 years, 9 months
gatein SVN: r6020 - in components/pc/trunk: controller and 11 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 16:04:06 -0400 (Mon, 14 Mar 2011)
New Revision: 6020
Modified:
components/pc/trunk/controller/pom.xml
components/pc/trunk/distrib/distrib.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml
components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
GTNPC-57: Update Maven dependencies
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/controller/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -23,6 +23,24 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: components/pc/trunk/distrib/distrib.xml
===================================================================
--- components/pc/trunk/distrib/distrib.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/distrib/distrib.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -2,9 +2,9 @@
<property name="source.dir" value="../"/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.1.1-GA"/>
- <property name="demo.release.version" value="2.1.1-GA"/>
- <property name="maven.version" value="2.1.1-GA"/>
+ <property name="pc.release.version" value="2.3.0-Beta01"/>
+ <property name="demo.release.version" value="2.3.0-Beta01"/>
+ <property name="maven.version" value="2.3.0-Beta01"/>
<!-- -->
<property name="pc.release.name" value="gatein-portletcontainer-${pc.release.version}"/>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.1.0-Beta01</version>
</parent>
<scm>
@@ -45,8 +45,8 @@
</scm>
<properties>
- <version.gatein.common>2.0.3-GA</version.gatein.common>
- <version.gatein.wci>2.1.0-Alpha03</version.gatein.wci>
+ <version.gatein.common>2.0.4-Beta01</version.gatein.common>
+ <version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-Beta01</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -125,7 +125,13 @@
<artifactId>pc-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
@@ -153,12 +159,12 @@
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${version.apache.taglibs}</version>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${version.apache.taglibs}</version>
</dependency>
@@ -301,43 +307,4 @@
</profile>
</profiles>
- <repositories>
-
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <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 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portal/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -57,7 +57,6 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
</dependency>
-
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
@@ -71,6 +70,16 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-jdk</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -97,16 +106,16 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -115,7 +124,6 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.6</version>
</dependency>
-
</dependencies>
<build>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -43,12 +43,6 @@
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -43,12 +43,6 @@
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -23,7 +23,7 @@
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
<include>javax.portlet:portlet-api</include>
@@ -33,8 +33,8 @@
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
- <include>apache-taglibs:jstl</include>
- <include>apache-taglibs:standard</include>
+ <include>javax.servlet:jstl</include>
+ <include>taglibs:standard</include>
</includes>
</dependencySet>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -23,7 +23,7 @@
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
<include>javax.portlet:portlet-api</include>
@@ -33,8 +33,8 @@
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
- <include>apache-taglibs:jstl</include>
- <include>apache-taglibs:standard</include>
+ <include>javax.servlet:jstl</include>
+ <include>taglibs:standard</include>
</includes>
</dependencySet>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/portlet/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -41,6 +41,24 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/core/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -45,7 +45,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -67,6 +67,22 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -76,10 +92,42 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -62,6 +62,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -71,10 +75,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -141,11 +173,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -378,4 +410,4 @@
<!-- Fix 1.0.3 deployment problems with jboss42 -->
<version.cargo>1.0.2</version.cargo>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -140,11 +172,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -382,4 +414,4 @@
<!-- Fix 1.0.3 deployment problems with jboss51 deployer-->
<version.cargo>1.0.2</version.cargo>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -140,11 +172,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -146,11 +178,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -379,4 +411,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -140,11 +172,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -373,4 +405,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:03:16 UTC (rev 6019)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-03-14 20:04:06 UTC (rev 6020)
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,39 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -140,11 +173,11 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -373,4 +406,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
13 years, 9 months
gatein SVN: r6019 - components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 16:03:16 -0400 (Mon, 14 Mar 2011)
New Revision: 6019
Modified:
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
Log:
GTNPC-45 : Remove JBoss MC usage from pc test suite execution\nRevert wrong commit
Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-03-14 16:18:04 UTC (rev 6018)
+++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-03-14 20:03:16 UTC (rev 6019)
@@ -47,7 +47,7 @@
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
<listener>
- <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
13 years, 9 months
gatein SVN: r6018 - in components/wci/trunk: exo and 16 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 12:18:04 -0400 (Mon, 14 Mar 2011)
New Revision: 6018
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/tomcat/tomcat6/pom.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/exo/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/jetty/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.0-Beta01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/core/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-03-14 16:17:10 UTC (rev 6017)
+++ components/wci/trunk/wci/pom.xml 2011-03-14 16:18:04 UTC (rev 6018)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta01</version>
+ <version>2.1.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 9 months
gatein SVN: r6017 - components/wci/tags.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 12:17:10 -0400 (Mon, 14 Mar 2011)
New Revision: 6017
Added:
components/wci/tags/2.1.0-Beta01/
Log:
[maven-scm] copy for tag 2.1.0-Beta01
13 years, 9 months
gatein SVN: r6016 - in components/wci/trunk: exo and 19 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-14 11:51:37 -0400 (Mon, 14 Mar 2011)
New Revision: 6016
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml
components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml
components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml
components/wci/trunk/tomcat/tomcat6/pom.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
components/wci/trunk/wci/pom.xml
Log:
GTNWCI-24: Update Maven dependencies
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/exo/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/jetty/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -6,34 +6,35 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.1-GA</version>
+ <version>1.1.0-Beta01</version>
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.0-Beta01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta01</url>
</scm>
<properties>
- <version.gatein.common>2.0.3-GA</version.gatein.common>
+ <version.gatein.common>2.0.4-Beta01</version.gatein.common>
<version.junit>3.8.2-brew</version.junit>
+ <version.jboss.unit>1.2.3</version.jboss.unit>
<version.jaxb>2.1</version.jaxb>
<version.jetty>6.1.21</version.jetty>
<version.jaxen>1.0-FCS</version.jaxen>
<version.saxpath>1.0-FCS</version.saxpath>
<version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
- <version.jboss.unit>1.2.3</version.jboss.unit>
<version.cargo>1.0.3</version.cargo>
<version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
+ <version.oswego.concurrent>1.3.4</version.oswego.concurrent>
</properties>
@@ -43,7 +44,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-Beta01</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -141,6 +142,11 @@
<artifactId>commons-discovery</artifactId>
<version>${version.discovery}</version>
</dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${version.oswego.concurrent}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -154,23 +160,6 @@
<module>test</module>
</modules>
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<plugins>
@@ -208,8 +197,7 @@
</execution>
</executions>
</plugin>
-
- </plugins>
+ </plugins>
</build>
</project>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/core/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
@@ -33,7 +33,30 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${version.oswego.concurrent}</version>
+ </dependency>
</dependencies>
<build>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -156,7 +156,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
@@ -329,7 +329,7 @@
<property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
<property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
<property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" />
+ <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" />
<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
<property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
@@ -89,6 +89,10 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -110,6 +114,22 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -121,6 +141,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- JBOSS MICROCONAINER DEPENDENCIES -->
@@ -146,7 +174,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
@@ -94,6 +94,22 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -115,6 +131,26 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -126,6 +162,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- JBOSS MICROCONAINER DEPENDENCIES -->
@@ -151,7 +195,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
@@ -99,6 +99,10 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -120,6 +124,22 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,6 +151,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- JBOSS MICROCONAINER DEPENDENCIES -->
@@ -156,7 +184,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
@@ -301,30 +329,30 @@
<tasks>
<!-- properties to pass to the build.xml -->
- <property name="project.build.directory" value="${project.build.directory}"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="project.build.directory" value="${project.build.directory}" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
<property name="test_classpath" refid="maven.test.classpath" />
<!-- hack here allows for profiles to effect tasks in the build.xml -->
<!-- this should be removed when the antrun plugin properly handles properties -->
<condition property="test.generic.enable">
- <istrue value="${test.generic}"/>
+ <istrue value="${test.generic}" />
</condition>
<condition property="test.native.enable">
- <istrue value="${test.native}"/>
+ <istrue value="${test.native}" />
</condition>
<condition property="test.exo.enable">
- <istrue value="${test.exo}"/>
+ <istrue value="${test.exo}" />
</condition>
<condition property="test.endpoint.enable">
- <istrue value="${test.endpoint}"/>
+ <istrue value="${test.endpoint}" />
</condition>
<condition property="cargo.debug" value="${test.cargo.debug}">
- <isset property="test.cargo.debug"/>
+ <isset property="test.cargo.debug" />
</condition>
<condition property="cargo.debug" value="">
<not>
- <isset property="test.cargo.debug"/>
+ <isset property="test.cargo.debug" />
</not>
</condition>
<!-- end profiles hack -->
@@ -346,21 +374,21 @@
<property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" />
<!-- locations of archives to use -->
- <property name="test.archives.directory" value="${project.build.directory}/test-archives"/>
- <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war"/>
- <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war"/>
- <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war"/>
+ <property name="test.archives.directory" value="${project.build.directory}/test-archives" />
+ <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" />
+ <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" />
+ <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" />
- <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war"/>
- <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war"/>
- <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war"/>
+ <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" />
+ <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" />
+ <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" />
- <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}"/>
- <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}"/>
- <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}"/>
+ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
+ <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <property name="common.xml.file" value="${test.common.xml}" />
<!-- -->
<!-- Cargo Jetty deployer -->
@@ -368,7 +396,7 @@
<ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">
- <target name="tests"/>
+ <target name="tests" />
</ant>
</tasks>
</configuration>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
@@ -99,6 +99,10 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -120,6 +124,22 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,6 +151,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- JBOSS MICROCONAINER DEPENDENCIES -->
@@ -156,7 +184,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
@@ -99,6 +99,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -120,6 +128,22 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,6 +155,14 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- JBOSS MICROCONAINER DEPENDENCIES -->
@@ -156,7 +188,7 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-default-servlet-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/endpoint-root-path-mapping.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-exo-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-generic-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-lifecycle-listener-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:xml-apis</include>
<include>concurrent:concurrent</include>
Modified: components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/test/servers/tomcat7/src/assembly/spi-native-server.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -35,7 +35,7 @@
<include>javax.xml.bind:jaxb-api</include>
<include>org.jboss:jbossxb</include>
<!-- others -->
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-03-14 05:43:02 UTC (rev 6015)
+++ components/wci/trunk/wci/pom.xml 2011-03-14 15:51:37 UTC (rev 6016)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Alpha04-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 9 months
gatein SVN: r6015 - epp/docs/branches.
by do-not-reply@jboss.org
Author: smumford
Date: 2011-03-14 01:43:02 -0400 (Mon, 14 Mar 2011)
New Revision: 6015
Added:
epp/docs/branches/EPP_5_2_Branch/
Log:
Creating 5.2 branch
13 years, 9 months
gatein SVN: r6014 - in components/wsrp/trunk: admin-gui and 12 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-12 09:46:31 -0500 (Sat, 12 Mar 2011)
New Revision: 6014
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/ws-security/jboss5/pom.xml
components/wsrp/trunk/ws-security/wss/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/api/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/common/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/consumer/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Alp...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Alpha01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/producer/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/test/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-03-12 14:46:01 UTC (rev 6013)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-03-12 14:46:31 UTC (rev 6014)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Alpha01</version>
+ <version>2.1.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months
gatein SVN: r6013 - components/wsrp/tags.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-12 09:46:01 -0500 (Sat, 12 Mar 2011)
New Revision: 6013
Added:
components/wsrp/tags/2.1.0-Alpha01/
Log:
[maven-scm] copy for tag 2.1.0-Alpha01
13 years, 9 months
gatein SVN: r6012 - in components/wsrp/trunk: admin-gui and 12 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-12 09:45:37 -0500 (Sat, 12 Mar 2011)
New Revision: 6012
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/ws-security/jboss5/pom.xml
components/wsrp/trunk/ws-security/wss/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.0-Alpha01
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/api/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/common/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/consumer/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -22,14 +22,13 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -22,13 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Alp...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Alpha01</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/producer/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/test/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-03-12 14:32:13 UTC (rev 6011)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-03-12 14:45:37 UTC (rev 6012)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Alpha01-SNAPSHOT</version>
+ <version>2.1.0-Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months