[gatein-commits] gatein SVN: r6747 - in components/pc/trunk: docs/user-guide and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2011-06-25 04:13:38 -0400 (Sat, 25 Jun 2011) New Revision: 6747 Modified: components/pc/trunk/docs/user-guide/pom.xml components/pc/trunk/pom.xml Log: - Fixed a couple of maven warnings: + Removed duplicated junit dependency. + Use project.name instead of pom.name. Modified: components/pc/trunk/docs/user-guide/pom.xml =================================================================== --- components/pc/trunk/docs/user-guide/pom.xml 2011-06-24 22:50:40 UTC (rev 6746) +++ components/pc/trunk/docs/user-guide/pom.xml 2011-06-25 08:13:38 UTC (rev 6747) @@ -1,6 +1,7 @@ -<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"> +<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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.pc</groupId> @@ -13,8 +14,8 @@ <name>GateIn - Portlet Container (User Guide ${translation})</name> <properties> - <enforcer.skip>true</enforcer.skip> - <translation>en-US</translation> + <enforcer.skip>true</enforcer.skip> + <translation>en-US</translation> </properties> <pluginRepositories> @@ -42,69 +43,69 @@ </pluginRepositories> <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.1</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.gatein.doc</groupId> - <artifactId>gatein-docbook-xslt</artifactId> - <version>1.0.0-CR2</version> - </dependency> - <dependency> - <groupId>org.gatein.doc</groupId> - <artifactId>gatein-jdocbook-style</artifactId> - <version>1.0.0-CR2</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${pom.basedir}/en</sourceDirectory> - <imageResource> - <directory>${pom.basedir}/en</directory> - <includes> - <include>images/**/*</include> - </includes> - </imageResource> - <!--<cssResource> - <directory>src/main/css</directory> - </cssResource>--> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath://xslt/org/gatein/pdf.xsl</stylesheetResource> - <finalName>${pom.name}.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/gatein/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/gatein/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>eclipse</formatName> - <stylesheetResource>classpath:/xslt/org/gatein/eclipse.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> - <!-- could also locate the docbook dependency and inspect its version... --> - <docbookVersion>1.74.0</docbookVersion> - </options> - </configuration> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.1</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.gatein.doc</groupId> + <artifactId>gatein-docbook-xslt</artifactId> + <version>1.0.0-CR2</version> + </dependency> + <dependency> + <groupId>org.gatein.doc</groupId> + <artifactId>gatein-jdocbook-style</artifactId> + <version>1.0.0-CR2</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${pom.basedir}/en</sourceDirectory> + <imageResource> + <directory>${pom.basedir}/en</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> + <!--<cssResource> + <directory>src/main/css</directory> + </cssResource>--> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath://xslt/org/gatein/pdf.xsl</stylesheetResource> + <finalName>${project.name}.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/gatein/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/gatein/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>classpath:/xslt/org/gatein/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> + <!-- could also locate the docbook dependency and inspect its version... --> + <docbookVersion>1.74.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2011-06-24 22:50:40 UTC (rev 6746) +++ components/pc/trunk/pom.xml 2011-06-25 08:13:38 UTC (rev 6747) @@ -21,7 +21,8 @@ ~ 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"> +<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> @@ -214,7 +215,7 @@ <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <version>${version.jboss.logging}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.portals.bridges</groupId> @@ -223,15 +224,10 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven-ant-tasks</artifactId> + <version>2.1.1</version> </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-ant-tasks</artifactId> - <version>2.1.1</version> - </dependency> </dependencies> </dependencyManagement> @@ -271,14 +267,14 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -291,8 +287,8 @@ <version>1.2.1</version> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId>