Author: steve.ebersole(a)jboss.com Date: 2008-02-18 14:44:28 -0500 (Mon, 18 Feb 2008) New Revision: 14335 Modified: maven-poms/trunk/ maven-poms/trunk/core-manual-parent/ maven-poms/trunk/core-parent/ maven-poms/trunk/core-parent/pom.xml Log: svn:ignores + plugin versions in core-parent Property changes on: maven-poms/trunk ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: maven-poms/trunk/core-manual-parent ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: maven-poms/trunk/core-parent ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Modified: maven-poms/trunk/core-parent/pom.xml =================================================================== --- maven-poms/trunk/core-parent/pom.xml 2008-02-14 15:32:18 UTC (rev 14334) +++ maven-poms/trunk/core-parent/pom.xml 2008-02-18 19:44:28 UTC (rev 14335) @@ -1,20 +1,29 @@ -<?xml version="1.0"?> - -<!-- - ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved. - ~ - ~ This copyrighted material is made available to anyone wishing to use, modify, - ~ copy, or redistribute it subject to the terms and conditions of the GNU - ~ Lesser General Public License, v. 2.1. This program is distributed in the - ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied - ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. You should have received a - ~ copy of the GNU Lesser General Public License, v.2.1 along with this - ~ distribution; if not, write to the Free Software Foundation, Inc., - ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ~ - ~ Red Hat Author(s): Steve Ebersole - --> +<?xml version="1.0"?> + +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors. All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + ~ + --> <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"> @@ -27,7 +36,7 @@ <version>1</version> <name>Hibernate Core Parent</name> - <description>The parent POM for all Hibernate Core modules.</description> + <description>The base POM for all Hibernate Core modules.</description> <url>http://hibernate.org</url> <organization> @@ -100,12 +109,12 @@ </mailingList> </mailingLists> - <build> + <build> <plugins> <plugin> - <!-- require at least JDK 1.5 to run the build --> + <!-- require at least JDK 1.5 to run the build --> <!-- ... --> - <!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage --> + <!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage --> <!-- 2.0.8 not released at this time, so I instead say anything greater that 2.0.7 --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -120,9 +129,9 @@ <rules> <requireJavaVersion> <version>[1.5,)</version> - </requireJavaVersion> - <requireMavenVersion> - <version>(2.0.7,)</version> + </requireJavaVersion> + <requireMavenVersion> + <version>(2.0.7,)</version> </requireMavenVersion> </rules> </configuration> @@ -142,27 +151,27 @@ <!-- add specification/implementation details to the manifests --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration> <archive> <manifest> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>${pom.url}</Implementation-URL> + </manifest> + <manifestEntries> + <Implementation-URL>${pom.url}</Implementation-URL> </manifestEntries> </archive> </configuration> </plugin> - </plugins> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> + </plugins> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> </extensions> </build> @@ -170,7 +179,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> + <artifactId>maven-javadoc-plugin</artifactId> <version>2.3</version> <configuration> <aggregate>${hibernate.core.reports.aggregate}</aggregate> @@ -183,6 +192,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> <configuration> <aggregate>${hibernate.core.reports.aggregate}</aggregate> </configuration> @@ -190,6 +200,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> + <version>2.2</version> <configuration> <aggregate>${hibernate.core.reports.aggregate}</aggregate> <linkXref>true</linkXref> @@ -200,6 +211,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> + <version>2.1</version> <configuration> <aggregate>${hibernate.core.reports.aggregate}</aggregate> <tags> @@ -218,10 +230,12 @@ <!-- Note: aggregate-able, may cause problems if we aggregate jxr and not this because of the xref links --> <groupId>org.codehaus.mojo</groupId> <artifactId>javancss-maven-plugin</artifactId> + <version>2.0-beta-2</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> + <version>1.1.1</version> <configuration> <onlyAnalyze>org.hibernate.*</onlyAnalyze> </configuration> @@ -229,47 +243,47 @@ </plugins> </reporting> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - </dependencies> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.6</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> + </dependencies> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.2</version> </dependency> <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - </dependencies> - </dependencyManagement> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + </dependencies> + </dependencyManagement> <distributionManagement> <repository> @@ -289,6 +303,6 @@ <properties> <hibernate.core.reports.aggregate>false</hibernate.core.reports.aggregate> - </properties> + </properties> </project>