Author: jbalunas(a)redhat.com Date: 2010-08-12 18:43:03 -0400 (Thu, 12 Aug 2010) New Revision: 18605 Modified: branches/RF-9040_build_updated_m2/bom/pom.xml branches/RF-9040_build_updated_m2/ui/common/api/pom.xml branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml branches/RF-9040_build_updated_m2/ui/output/api/pom.xml branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml Log: RF-9040, RF9042 cleanup and updates because of refactor Modified: branches/RF-9040_build_updated_m2/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -113,11 +113,6 @@ <artifactId>richfaces-components-ui</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> <!-- JSF 2 --> <dependency> <groupId>javax.faces</groupId> Modified: branches/RF-9040_build_updated_m2/ui/common/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -33,56 +33,4 @@ <artifactId>richfaces-ui-common-api</artifactId> <name>Richfaces UI Components: Common API</name> <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </project> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -43,62 +43,6 @@ <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - - <!-- runtime --> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -30,85 +30,11 @@ <name>Richfaces UI Components: Core UI</name> <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - </plugins> - </build> <dependencies> - <!-- runtime --> <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -35,28 +35,7 @@ <packaging>jar</packaging> <dependencies> - <!-- JSF with dependencies --> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -64,34 +43,6 @@ <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -35,101 +35,16 @@ <name>Richfaces UI Components: Iteration UI</name> <packaging>jar</packaging> - <properties> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <!-- runtime --> <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -59,75 +59,20 @@ </properties> <dependencies> - <!-- artifacts for javadoc generation --> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> + </dependency> </dependencies> <profiles> <profile> <id>release</id> - + <!-- TODO this needs to be centralized in ui-parent --> <build> <plugins> <plugin> Modified: branches/RF-9040_build_updated_m2/ui/output/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -38,63 +38,9 @@ <dependencies> <!-- runtime --> <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -44,17 +44,7 @@ </build> <dependencies> - <!-- runtime --> <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> @@ -64,65 +54,9 @@ <artifactId>richfaces-ui-core-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.richfaces.ui.output</groupId> <artifactId>richfaces-ui-output-api</artifactId> </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 22:37:47 UTC (rev 18604) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 22:43:03 UTC (rev 18605) @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - JBoss, Home of Professional Open Source Copyright 2010, Red Hat, - Inc. and individual contributors by the @authors tag. See the - copyright.txt in the distribution for a full listing of - individual contributors. This is free software; you can - redistribute it and/or modify it under the terms of the GNU - Lesser General Public License as published by the Free Software - Foundation; either version 2.1 of the License, or (at your - option) any later version. This software is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, - write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: - http://www.fsf.org. ---> + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 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"> + 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> @@ -38,7 +39,7 @@ <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> - + <build> <pluginManagement> <plugins> @@ -62,8 +63,10 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <version>${project.version}</version> - <!-- TODO Is this a problem because this parent is not specific - to iteration? --> + <!-- + TODO Is this a problem because this parent is + not specific to iteration? + --> <configuration> <library> <prefix>org.richfaces</prefix> @@ -127,6 +130,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency>