Author: Alex.Kolonitsky Date: 2010-05-17 09:12:07 -0400 (Mon, 17 May 2010) New Revision: 17077 Modified: root/core/trunk/bom/pom.xml root/core/trunk/parent/pom.xml root/core/trunk/pom.xml Log: revert previous commit Modified: root/core/trunk/bom/pom.xml =================================================================== --- root/core/trunk/bom/pom.xml 2010-05-17 12:35:26 UTC (rev 17076) +++ root/core/trunk/bom/pom.xml 2010-05-17 13:12:07 UTC (rev 17077) @@ -20,17 +20,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Core BOM</name> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <description> The RichFaces Core "Bill of Materials". This defines core api/impl specific runtime dependency versions. </description> Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-05-17 12:35:26 UTC (rev 17076) +++ root/core/trunk/parent/pom.xml 2010-05-17 13:12:07 UTC (rev 17077) @@ -21,26 +21,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Core Parent</name> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <description> The Parent for all RichFaces core sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom. </description> - <modules> - <module>../api</module> - <module>../impl</module> - </modules> - <properties> <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> </properties> @@ -55,23 +51,6 @@ <scope>import</scope> </dependency> - <!-- Test Dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.6</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <!-- These dependencies are usually provided by org.jboss.test-jsf:htmlunit-client, but the latest 2.7 Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-17 12:35:26 UTC (rev 17076) +++ root/core/trunk/pom.xml 2010-05-17 13:12:07 UTC (rev 17077) @@ -40,8 +40,8 @@ <modules> <module>bom</module> <module>parent</module> - <!--<module>api</module>--> - <!--<module>impl</module>--> + <module>api</module> + <module>impl</module> </modules> </project>