Author: aheritier Date: 2009-10-05 21:23:57 -0400 (Mon, 05 Oct 2009) New Revision: 284 Modified: tools/maven/parent/trunk/pom.xml Log: cleanup pom using jboss-parent 5-beta-3-SNAPSHOT Modified: tools/maven/parent/trunk/pom.xml =================================================================== --- tools/maven/parent/trunk/pom.xml 2009-10-05 15:39:14 UTC (rev 283) +++ tools/maven/parent/trunk/pom.xml 2009-10-06 01:23:57 UTC (rev 284) @@ -4,6 +4,12 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5-beta-3-SNAPSHOT</version> + </parent> + <name>GateIn parent</name> <description>Parent POM for GateIn components project.</description> <url>www.jboss.org/gatein</url> @@ -12,13 +18,7 @@ <artifactId>gatein-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>5-beta-1</version> - </parent> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/p... <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/m... @@ -26,18 +26,16 @@ </scm> <properties> - <!-- Plugins settings --> - - <!-- Cross plugins settings --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- ************** --> + <!-- Build settings --> + <!-- ************** --> <!-- maven-compiler-plugin --> - <maven.compiler.target>1.5</maven.compiler.target> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> + <maven.compiler.showWarnings>true</maven.compiler.showWarnings> + <maven.compiler.optimize>true</maven.compiler.optimize> <!-- maven-release-plugin --> - <useReleaseProfile>false</useReleaseProfile> - <arguments>-Prelease</arguments> <autoVersionSubmodules>true</autoVersionSubmodules> </properties> @@ -52,75 +50,12 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>jboss-packaging-maven-plugin</artifactId> <version>2.0-beta-1</version> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.3</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <optimize>true</optimize> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.4</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - </plugin> - - <plugin> - <artifactId>maven-idea-plugin</artifactId> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> <configuration> <archive> <manifest> @@ -130,11 +65,9 @@ </archive> </configuration> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifest> @@ -143,36 +76,9 @@ </archive> </configuration> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - <!-- We cannot set properties to configure the plugin - because the config is hardcoded in JBoss Parent --> - <configuration> - <useReleaseProfile>${useReleaseProfile}</useReleaseProfile> - <arguments>${arguments}</arguments> - <autoVersionSubmodules>${autoVersionSubmodules}</autoVersionSubmodules> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1</version> <configuration> <!-- This is a workaroud for MSOURCES-44 --> <includePom>true</includePom> @@ -183,12 +89,6 @@ </archive> </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> </plugins> </pluginManagement> </build> @@ -201,23 +101,18 @@ <repository> <id>repository.jboss.org</id> <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> + <url>http://repository.jboss.org/maven2</url> </repository> <repository> <id>snapshots.jboss.org</id> <name>JBoss Snapshots Repository</name> - <layout>default</layout> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> + <url>http://snapshots.jboss.org/maven2</url> <releases> <enabled>false</enabled> </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> </repository> </repositories> @@ -235,10 +130,8 @@ </pluginRepository> <pluginRepository> <id>repository.jboss.org</id> + <name>JBoss Repository</name> <url>http://repository.jboss.org/maven2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> </pluginRepository> <pluginRepository> <id>java.net maven repository</id> @@ -259,13 +152,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> + <reportSets> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> </plugin> </plugins> </reporting> </project> - -