7:54 a.m.
Author: jbalunas(a)redhat.com
Date: 2010-08-13 08:54:58 -0400 (Fri, 13 Aug 2010)
New Revision: 18617
Modified:
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/ui/pom.xml
branches/RF-9040_build_updated_m2/ui/misc/ui/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 readded cdk plugin to component builds
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-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -44,5 +44,4 @@
<artifactId>richfaces-ui-common-api</artifactId>
</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-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -1,27 +1,32 @@
-<!--
- 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/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd"
+>
<parent>
<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>
@@ -32,11 +37,29 @@
<dependencies>
<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>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/c...
</connection>
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-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -47,6 +47,15 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/i...
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
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-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -41,15 +41,6 @@
<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>
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-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -34,6 +34,7 @@
<artifactId>richfaces-ui-output-ui</artifactId>
<name>Richfaces UI Components: Output UI</name>
<packaging>jar</packaging>
+
<build>
<plugins>
<plugin>
Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml
===================================================================
--- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-13 12:40:20 UTC (rev
18616)
+++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-13 12:54:58 UTC (rev
18617)
@@ -63,20 +63,6 @@
<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?
- -->
- <configuration>
- <library>
- <prefix>org.richfaces</prefix>
- <taglib>
- <uri>http://richfaces.org/iteration</uri>
- <shortName>it</shortName>
- <displayName>Iteration components
tags</displayName>
- </taglib>
- </library>
- </configuration>
<executions>
<execution>
<id>cdk-generate-sources</id>