[richfaces-svn-commits] JBoss Rich Faces SVN: r18729 - in trunk/cdk: plugins and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2010-08-17 14:15:50 -0400 (Tue, 17 Aug 2010)
New Revision: 18729

Added:
   trunk/cdk/plugins/maven-resources-plugin/
Modified:
   trunk/cdk/bom/pom.xml
   trunk/cdk/plugins/maven-resources-plugin/pom.xml
   trunk/cdk/plugins/pom.xml
Log:
Moving maven-resources-plugin into main build

Modified: trunk/cdk/bom/pom.xml
===================================================================
--- trunk/cdk/bom/pom.xml	2010-08-17 17:33:54 UTC (rev 18728)
+++ trunk/cdk/bom/pom.xml	2010-08-17 18:15:50 UTC (rev 18729)
@@ -151,6 +151,37 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>0.9.5-RC2_jboss-SP1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.collections</groupId>
+                        <artifactId>google-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.el</groupId>
+                <artifactId>el-ri</artifactId>
+                <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>
+            </dependency>
+            <dependency>
+                <groupId>com.yahoo.platform.yui</groupId>
+                <artifactId>yuicompressor</artifactId>
+                <version>2.3.6</version>
+            </dependency>
 
 			<!-- Tests -->
 			<dependency>

Copied: trunk/cdk/plugins/maven-resources-plugin (from rev 18655, sandbox/trunk/cdk/maven-resources-plugin)

Modified: trunk/cdk/plugins/maven-resources-plugin/pom.xml
===================================================================
--- sandbox/trunk/cdk/maven-resources-plugin/pom.xml	2010-08-16 11:52:42 UTC (rev 18655)
+++ trunk/cdk/plugins/maven-resources-plugin/pom.xml	2010-08-17 18:15:50 UTC (rev 18729)
@@ -3,23 +3,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.richfaces.cdk</groupId>
-        <artifactId>maven-plugins</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+		<groupId>org.richfaces.cdk</groupId>
+		<artifactId>maven-plugins</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.richfaces.cdk</groupId>
     <artifactId>maven-resources-plugin</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
+    <name>maven-resources-plugin</name>
+    <description>Maven plugin for packaging resources with web application</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -53,56 +49,44 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.5-RC2_jboss-SP1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>google-collections</artifactId>
-                    <groupId>com.google.collections</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>r06</version>
         </dependency>
 
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>el-api</artifactId>
-            <version>2.2</version>
         </dependency>
 
         <dependency>
             <groupId>com.sun.el</groupId>
             <artifactId>el-ri</artifactId>
-            <version>1.0</version>
         </dependency>
+        
         <dependency>
             <groupId>com.sun.faces</groupId>
             <artifactId>jsf-api</artifactId>
-            <version>2.0.3-b03</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>
         </dependency>
+
         <dependency>
         	<groupId>com.yahoo.platform.yui</groupId>
         	<artifactId>yuicompressor</artifactId>
-        	<version>2.3.6</version>
         </dependency>
     </dependencies>
 

Modified: trunk/cdk/plugins/pom.xml
===================================================================
--- trunk/cdk/plugins/pom.xml	2010-08-17 17:33:54 UTC (rev 18728)
+++ trunk/cdk/plugins/pom.xml	2010-08-17 18:15:50 UTC (rev 18729)
@@ -34,6 +34,7 @@
     <module>xinclude</module>
 	<module>generator</module>
 	<module>maven-cdk-plugin</module>
+	<module>maven-resources-plugin</module>
   </modules>
 
 </project>