Author: alexsmirnov Date: 2009-07-06 17:18:55 -0400 (Mon, 06 Jul 2009) New Revision: 14802 Modified: cdk/trunk/plugins/generator/pom.xml cdk/trunk/plugins/maven-cdk-plugin/pom.xml cdk/trunk/plugins/maven-javascript-plugin/pom.xml cdk/trunk/plugins/maven-resource-dependency-plugin/pom.xml cdk/trunk/plugins/pom.xml Log: fix pom.xml hierarchy Modified: cdk/trunk/plugins/generator/pom.xml =================================================================== --- cdk/trunk/plugins/generator/pom.xml 2009-07-06 21:07:31 UTC (rev 14801) +++ cdk/trunk/plugins/generator/pom.xml 2009-07-06 21:18:55 UTC (rev 14802) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent> - <artifactId>cdk</artifactId> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,20 +22,20 @@ <target>1.6</target> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>xjc</goal> - </goals> - </execution> - </executions> - <configuration> - <packageName>org.richfaces.cdk.model</packageName> <!-- The name of your generated source package --> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>xjc</goal> + </goals> + </execution> + </executions> + <configuration> + <packageName>org.richfaces.cdk.model</packageName> <!-- The name of your generated source package --> + </configuration> + </plugin> </plugins> </build> <dependencies> Modified: cdk/trunk/plugins/maven-cdk-plugin/pom.xml =================================================================== --- cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2009-07-06 21:07:31 UTC (rev 14801) +++ cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2009-07-06 21:18:55 UTC (rev 14802) @@ -1,7 +1,8 @@ -<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"> +<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"> <parent> - <artifactId>cdk</artifactId> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -61,17 +62,25 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> <version>1.0-alpha-18</version> <executions> <execution> <goals> - <!-- Generate the xpp3 reader code --> + <!-- Generate the xpp3 reader code --> <goal>xpp3-reader</goal> - <!-- Generate the xpp3 writer code --> + <!-- Generate the xpp3 writer code --> <goal>xpp3-writer</goal> - <!-- Generate the Java sources for the model itself --> + <!-- Generate the Java sources for the model itself --> <goal>java</goal> </goals> </execution> Modified: cdk/trunk/plugins/maven-javascript-plugin/pom.xml =================================================================== --- cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2009-07-06 21:07:31 UTC (rev 14801) +++ cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2009-07-06 21:18:55 UTC (rev 14802) @@ -1,9 +1,9 @@ -<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"> +<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"> <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.cdk</groupId> Modified: cdk/trunk/plugins/maven-resource-dependency-plugin/pom.xml =================================================================== --- cdk/trunk/plugins/maven-resource-dependency-plugin/pom.xml 2009-07-06 21:07:31 UTC (rev 14801) +++ cdk/trunk/plugins/maven-resource-dependency-plugin/pom.xml 2009-07-06 21:18:55 UTC (rev 14802) @@ -1,47 +1,46 @@ <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"> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.richfaces</groupId> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.richfaces.cdk</groupId> - - <artifactId>maven-resource-dependency-plugin</artifactId> - <packaging>maven-plugin</packaging> - <version>4.0.0-SNAPSHOT</version> - <name>maven-resource-dependency-plugin</name> - - - <dependencies> + </parent> + <modelVersion>4.0.0</modelVersion> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> + <groupId>org.richfaces.cdk</groupId> - <dependency> - <groupId>commons-vfs</groupId> - <artifactId>commons-vfs</artifactId> - <version>1.0</version> - </dependency> + <artifactId>maven-resource-dependency-plugin</artifactId> + <packaging>maven-plugin</packaging> + <version>4.0.0-SNAPSHOT</version> + <name>maven-resource-dependency-plugin</name> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - </dependencies> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-vfs</groupId> + <artifactId>commons-vfs</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.0</version> + </dependency> + + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + + </dependencies> </project> Modified: cdk/trunk/plugins/pom.xml =================================================================== --- cdk/trunk/plugins/pom.xml 2009-07-06 21:07:31 UTC (rev 14801) +++ cdk/trunk/plugins/pom.xml 2009-07-06 21:18:55 UTC (rev 14802) @@ -18,6 +18,7 @@ <modules> + <module>generator</module> <module>maven-cdk-plugin</module> </modules>