7:30 p.m.
Author: alexsmirnov
Date: 2010-08-19 20:30:13 -0400 (Thu, 19 Aug 2010)
New Revision: 18835
Modified:
branches/RF-9112/archetypes/pom.xml
branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml
branches/RF-9112/archetypes/richfaces-component-short/pom.xml
branches/RF-9112/archetypes/richfaces-component/pom.xml
branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml
branches/RF-9112/bom/pom.xml
branches/RF-9112/cdk/parent/pom.xml
branches/RF-9112/cdk/pom.xml
branches/RF-9112/core/parent/pom.xml
branches/RF-9112/core/pom.xml
branches/RF-9112/examples/parent/pom.xml
branches/RF-9112/examples/pom.xml
branches/RF-9112/parent/pom.xml
branches/RF-9112/pom.xml
branches/RF-9112/ui/core/api/pom.xml
branches/RF-9112/ui/pom.xml
Log:
fix bootstrap build
Modified: branches/RF-9112/archetypes/pom.xml
===================================================================
--- branches/RF-9112/archetypes/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -27,6 +27,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.archetypes</groupId>
Modified: branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 00:01:57
UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-08-20 00:30:13
UTC (rev 18835)
@@ -5,6 +5,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-component/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-component/pom.xml 2010-08-20 00:01:57 UTC (rev
18834)
+++ branches/RF-9112/archetypes/richfaces-component/pom.xml 2010-08-20 00:30:13 UTC (rev
18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-component-short/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-component-short/pom.xml 2010-08-20 00:01:57 UTC
(rev 18834)
+++ branches/RF-9112/archetypes/richfaces-component-short/pom.xml 2010-08-20 00:30:13 UTC
(rev 18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml
===================================================================
--- branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20
00:01:57 UTC (rev 18834)
+++ branches/RF-9112/archetypes/richfaces-components-aggregator/pom.xml 2010-08-20
00:30:13 UTC (rev 18835)
@@ -23,6 +23,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/bom/pom.xml
===================================================================
--- branches/RF-9112/bom/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/bom/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -31,6 +31,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<description>
Modified: branches/RF-9112/cdk/parent/pom.xml
===================================================================
--- branches/RF-9112/cdk/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/cdk/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -27,32 +27,7 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
<url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent</url>
</scm>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<pluginManagement>
<plugins>
@@ -146,16 +121,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
<version>1.0_02.CR4</version>
@@ -183,11 +148,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r05</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
@@ -268,11 +228,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.8</version>
Modified: branches/RF-9112/cdk/pom.xml
===================================================================
--- branches/RF-9112/cdk/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/cdk/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -6,6 +6,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/core/parent/pom.xml
===================================================================
--- branches/RF-9112/core/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/core/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -41,8 +41,8 @@
</properties>
<dependencyManagement>
- <dependencies>
- <!-- Test Dependencies -->
+ <dependencies>
+ <!-- Test Dependencies -->
<!--
These dependencies are usually provided by
org.jboss.test-jsf:htmlunit-client, but the latest 2.7
@@ -69,7 +69,7 @@
<artifactId>easymockclassextension</artifactId>
<version>2.5.2</version>
</dependency>
- </dependencies>
+ </dependencies>
</dependencyManagement>
<build>
Modified: branches/RF-9112/core/pom.xml
===================================================================
--- branches/RF-9112/core/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/core/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -24,6 +24,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: branches/RF-9112/examples/parent/pom.xml
===================================================================
--- branches/RF-9112/examples/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/examples/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -26,6 +26,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
Modified: branches/RF-9112/examples/pom.xml
===================================================================
--- branches/RF-9112/examples/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/examples/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -49,4 +50,4 @@
<!--<module>dist</module>-->
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: branches/RF-9112/parent/pom.xml
===================================================================
--- branches/RF-9112/parent/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/parent/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -31,6 +31,8 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../bom/pom.xml</relativePath>
+
</parent>
<description>
@@ -79,6 +81,33 @@
<artifactId>junit</artifactId>
<version>4.7</version>
</dependency>
+ <!-- Test Dependencies -->
+ <!--
+ These dependencies are usually provided by
+ org.jboss.test-jsf:htmlunit-client, but the latest 2.7
+ HtmlUnit version has problems with jQuery, so we are
+ overriding version back to 2.5.
+ -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: branches/RF-9112/pom.xml
===================================================================
--- branches/RF-9112/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -8,6 +8,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+ <relativePath>build/parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/ui/core/api/pom.xml
===================================================================
--- branches/RF-9112/ui/core/api/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/ui/core/api/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -22,6 +22,7 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/ui/pom.xml
===================================================================
--- branches/RF-9112/ui/pom.xml 2010-08-20 00:01:57 UTC (rev 18834)
+++ branches/RF-9112/ui/pom.xml 2010-08-20 00:30:13 UTC (rev 18835)
@@ -29,6 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10-SNAPSHOT</version>
+<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>