Author: bdaw Date: 2008-01-10 16:07:34 -0500 (Thu, 10 Jan 2008) New Revision: 9479 Modified: modules/template/build/pom.xml modules/template/module-a/pom.xml modules/template/module-b/module-b1/pom.xml modules/template/module-b/module-b2/pom.xml modules/template/module-b/pom.xml modules/template/module-c/pom.xml modules/template/pom.xml Log: correct artifact naming Modified: modules/template/build/pom.xml =================================================================== --- modules/template/build/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/build/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -16,17 +16,17 @@ <version>1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-parent</artifactId> + <version>1.0-CR1</version> <packaging>pom</packaging> - <name>JBoss Portal TemplateModule</name> + <name>JBoss Portal TemplateModule Parent</name> <description>JBoss Portal Template Module</description> <!--All artifacts versions should be defined here--> <properties> <version.junit>3.8.1</version.junit> - <version.jboss.unit>1.1.0-SNAPSHOT</version.jboss.unit> + <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit> </properties> @@ -78,7 +78,7 @@ <plugin> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-tooling-maven2</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </plugin> </plugins> </pluginManagement> Modified: modules/template/module-a/pom.xml =================================================================== --- modules/template/module-a/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/module-a/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,13 +1,13 @@ <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> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-parent</artifactId> + <version>1.0-CR1</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-templatemodule-a</artifactId> + <artifactId>template-module-a</artifactId> <packaging>jar</packaging> <name>JBoss Portal TemplateModule ModuleA</name> Modified: modules/template/module-b/module-b1/pom.xml =================================================================== --- modules/template/module-b/module-b1/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/module-b/module-b1/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,13 +1,13 @@ <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> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-parent</artifactId> + <version>1.0-CR1</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-templatemodule-b1</artifactId> + <artifactId>template-module-b1</artifactId> <packaging>jar</packaging> <name>JBoss Portal TemplateModule ModuleB1</name> Modified: modules/template/module-b/module-b2/pom.xml =================================================================== --- modules/template/module-b/module-b2/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/module-b/module-b2/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,21 +1,21 @@ <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> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-parent</artifactId> + <version>1.0-CR1</version> <relativePath>../../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-templatemodule-b2</artifactId> + <artifactId>template-module-b2</artifactId> <packaging>jar</packaging> <name>JBoss Portal TemplateModule ModuleB2</name> <!--Just a sample how we can refer to other modules in a project--> <dependencies> <dependency> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-templatemodule-b1</artifactId> + <groupId>org.jboss.portal.template</groupId> + <artifactId>template-module-b1</artifactId> <version>${project.version}</version> </dependency> </dependencies> Modified: modules/template/module-b/pom.xml =================================================================== --- modules/template/module-b/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/module-b/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-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"> <parent> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-aggregator</artifactId> + <version>1.0-CR1</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-tempatemodule-b-aggregator</artifactId> + <artifactId>tempate-module-b-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal TemplateModule ModuleB (aggregator)</name> - <version>1.0-SNAPSHOT</version> + <version>1.0-CR1</version> <modules> Modified: modules/template/module-c/pom.xml =================================================================== --- modules/template/module-c/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/module-c/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,13 +1,13 @@ <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> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-parent</artifactId> + <version>1.0-CR1</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-portal-templatemodule-c</artifactId> + <artifactId>template-module-c</artifactId> <packaging>jar</packaging> <name>JBoss Portal TemplateModule ModuleC</name> @@ -56,10 +56,10 @@ <!--<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>--> <!--A temporary fork of orginal extended plugin until they update to newer ant version--> - <groupId>org.jboss.unit</groupId> + <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> - <version>1.10-SNAPSHOT</version> + <version>1.13</version> <dependencies> Modified: modules/template/pom.xml =================================================================== --- modules/template/pom.xml 2008-01-10 20:38:01 UTC (rev 9478) +++ modules/template/pom.xml 2008-01-10 21:07:34 UTC (rev 9479) @@ -1,11 +1,11 @@ <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> - <groupId>org.jboss.portal.templatemodule</groupId> - <artifactId>jboss-portal-modules-templatemodule-aggregator</artifactId> + <groupId>org.jboss.portal.template</groupId> + <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Template Module (aggregator)</name> - <version>1.0-SNAPSHOT</version> + <version>1.0-CR1</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/>