You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2014/07/30 22:07:43 UTC

svn commit: r1614756 - in /creadur/rat/trunk: ./ apache-rat-core/ apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/ apache-rat-plugin/src/main/java/org/apache/rat/mp/

Author: pottlinger
Date: Wed Jul 30 20:07:42 2014
New Revision: 1614756

URL: http://svn.apache.org/r1614756
Log:
RAT-136: Upgrade commons-lang to latest commons-lang3
https://issues.apache.org/jira/browse/RAT-136

-Upgraded to most current commons-lang3:3.3.2, optimized imports, added release notes and new package structure.


Modified:
    creadur/rat/trunk/RELEASE_NOTES.txt
    creadur/rat/trunk/apache-rat-core/pom.xml
    creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
    creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
    creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
    creadur/rat/trunk/pom.xml

Modified: creadur/rat/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/RELEASE_NOTES.txt?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Wed Jul 30 20:07:42 2014
@@ -11,6 +11,7 @@ tbd
    * Improvements
      * [RAT-165] Introduce mvn default goal to ease build process, you can run the build by just launching mvn without any arguments. 
      * [RAT-148] Remove unnecessary method call in LicenseAddingReport (thanks to Chris A. Mattmann)
+     * [RAT-136] Update to commons-lang3 (thanks to Stevo Slavic)
  * Fixed javadoc warnings during build, upgraded maven's generation plugins to avoid warnings in generated code (https://jira.codehaus.org/browse/MPLUGIN-237)
  
 Rat 0.10

Modified: creadur/rat/trunk/apache-rat-core/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/pom.xml?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-core/pom.xml Wed Jul 30 20:07:42 2014
@@ -86,8 +86,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java Wed Jul 30 20:07:42 2014
@@ -20,7 +20,7 @@ package org.apache.rat.document.impl.gue
 
 import java.util.Locale;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class GuessUtils {
     

Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java Wed Jul 30 20:07:42 2014
@@ -21,7 +21,7 @@ package org.apache.rat.report.claim.impl
 import java.io.IOException;
 import java.util.Calendar;
 
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;

Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java (original)
+++ creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java Wed Jul 30 20:07:42 2014
@@ -19,10 +19,21 @@ package org.apache.rat.mp;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.transform.TransformerConfigurationException;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.rat.Defaults;
@@ -36,17 +47,6 @@ import org.apache.rat.report.IReportable
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.codehaus.plexus.util.DirectoryScanner;
 
-import javax.xml.transform.TransformerConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 
 /**
  * Abstract base class for Mojos, which are running Rat.

Modified: creadur/rat/trunk/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1614756&r1=1614755&r2=1614756&view=diff
==============================================================================
--- creadur/rat/trunk/pom.xml (original)
+++ creadur/rat/trunk/pom.xml Wed Jul 30 20:07:42 2014
@@ -1,34 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>13</version>
-  </parent>
-  <groupId>org.apache.rat</groupId>
-  <artifactId>apache-rat-project</artifactId>
-  <version>0.11-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Apache Creadur Rat</name>
-  <url>http://creadur.apache.org/rat/</url>
-  <description>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	You under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<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>
+	<parent>
+		<groupId>org.apache</groupId>
+		<artifactId>apache</artifactId>
+		<version>13</version>
+	</parent>
+	<groupId>org.apache.rat</groupId>
+	<artifactId>apache-rat-project</artifactId>
+	<version>0.11-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>Apache Creadur Rat</name>
+	<url>http://creadur.apache.org/rat/</url>
+	<description>
 Apache Rat is a release audit tool. It improves accuracy and efficiency when checking
 releases. It is heuristic in nature: making guesses about possible problems. It
 will produce false positives and cannot find every possible issue with a release.
@@ -41,499 +36,488 @@ Note that binary compatibility is not gu
 Apache Rat is developed by the Apache Creadur project, a language and build
 agnostic home for software distribution comprehension and audit tools.
   </description>
-  <inceptionYear>2006</inceptionYear>
+	<inceptionYear>2006</inceptionYear>
 
-  <prerequisites>
-    <maven>${mavenVersion}</maven>
-  </prerequisites>
-
-  <properties>
-    <javaVersion>1.5</javaVersion>
-    <maven.compiler.source>${javaVersion}</maven.compiler.source>
-    <maven.compiler.target>${javaVersion}</maven.compiler.target>
-    <mavenVersion>2.2.1</mavenVersion>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <!--
-    Publication to the website is a two phase operation:
-
-     1. Deploy to local stage: mvn site:deploy
-     2. Publish to Apache CMS: mvn scm-publish:publish-scm
-
-    This will only work when the origin for scm-publish:publish-scm
-    is the target for site:deploy.
-
-    SO MAKE SURE THAT THE FOLLOWING PROPERTIES RESOLVE TO THE SAME
-    DIRECTORY:
-
-     * scmpublish.content
-     * rat.site.url
-
-    -->
-    <rat.LocalSiteStaging>stage</rat.LocalSiteStaging>
-    <scmpublish.content>${rat.LocalSiteStaging}</scmpublish.content>
-    <rat.site.url>file:${rat.LocalSiteStaging}</rat.site.url>
-    <rat.site.name>Apache Rat Website</rat.site.name>
-    <rat.site.id>org.apache.rat.site</rat.site.id>
-
-    <!-- maven plugin versions -->
-    <surefire.version>2.15</surefire.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-tasks</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <!-- Later versions require Java 1.6+ -->
-        <version>2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <!-- Later versions use different package name / Maven coords -->
-        <version>2.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-compress</artifactId>
-        <version>1.5</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.11</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>1.7.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-antunit</artifactId>
-        <version>1.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-testutil</artifactId>
-        <version>1.7.1</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${surefire.version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-          <tagletArtifacts>
-            <tagletArtifact>
-              <groupId>org.apache.maven.plugin-tools</groupId>
-              <artifactId>maven-plugin-tools-javadoc</artifactId>
-              <version>3.3</version>
-            </tagletArtifact>
-          </tagletArtifacts>
-          <tags>
-            <tag>
-              <name>TODO</name>
-              <placement>X</placement>
-              <head>To do:</head>
-            </tag>
-          </tags>
-          <notimestamp>true</notimestamp>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <id>non-aggregate</id>
-            <configuration>
-            </configuration>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-          <reportSet>
-            <id>aggregate</id>
-            <configuration>
-            </configuration>
-            <reports>
-              <report>aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <targetJdk>${javaVersion}</targetJdk>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.7</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>dependencies</report>
-              <report>project-team</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>cim</report>
-              <report>license</report>
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <build>
-    <defaultGoal>clean install</defaultGoal>
-    <pluginManagement>
-      <!--
-        This section is typically used to configure the versions of
-        plugins that we use. Note, that we are inheriting from the
-        parent POM, so we only have to configure version numbers,
-        if ours is different.
-      -->
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.ant</groupId>
-              <artifactId>ant</artifactId>
-              <version>1.7.1</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.1</version>
-          <configuration>
-            <source>${javaVersion}</source>
-            <target>${javaVersion}</target>
-            <encoding>${project.build.sourceEncoding}</encoding>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.0.1</version>
-          <configuration>
-            <targetJdk>${javaVersion}</targetJdk>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
-          <configuration>
-            <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
-            <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-            <relativizeDecorationLinks>false</relativizeDecorationLinks>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <!-- Must use previous version, to avoid a cyclic reference -->
-          <version>0.8</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.0-beta-2</version>
-          <extensions>true</extensions>
-          <configuration>
-            <!-- svn location for publication -->
-            <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/creadur/site/trunk/content/rat/</pubScmUrl>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.4.1</version>
-          <configuration>
-            <mavenExecutorId>forked-path</mavenExecutorId>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <id>copy-site-resources</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false" />
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ssh</artifactId>
-         <version>1.0-beta-7</version>
-      </extension>
-    </extensions>
-  </build>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.apache.org/jira/browse/RAT</url>
-  </issueManagement>
-
-  <ciManagement>
-    <system>Buildbot</system>
-    <url>http://ci.apache.org/builders/rat_trunk</url>
-  </ciManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Rat Development (Apache Creadur project)</name>
-      <subscribe>dev-subscribe@creadur.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
-      <post>dev@creadur.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Rat Commits (Apache Creadur project)</name>
-      <subscribe>commits-subscribe@creadur.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>bodewig</id>
-      <name>Stefan Bodewig</name>
-      <email>bodewig@apache.org</email>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin@apache.org</email>
-    </developer>
-    <developer>
-      <id>jochen</id>
-      <name>Jochen Wiedmann</name>
-      <email>jochen@apache.org</email>
-    </developer>
-    <developer>
-      <id>gmcdonald</id>
-      <name>Gavin</name>
-      <email>gmcdonald@apache.org</email>
-    </developer>
-    <developer>
-      <id>brianf</id>
-      <name>Brian Fox</name>
-      <email>brianf@apache.org</email>
-    </developer>
-    <developer>
-      <id>dennisl</id>
-      <name>Dennis Lundberg</name>
-      <email>dennisl@apache.org</email>
-    </developer>
-    <developer>
-      <id>rgardler</id>
-      <name>Ross Gardler</name>
-      <email>rgardler@apache.org</email>
-    </developer>
-    <developer>
-      <id>crossley</id>
-      <name>David Crossley</name>
-      <email>crossley@apache.org</email>
-    </developer>
-    <developer>
-      <id>dblevins</id>
-      <name>David Blevins</name>
-      <email>dblevins@apache.org</email>
-    </developer>
-    <developer>
-      <id>pottlinger</id>
-      <name>Philipp Ottlinger</name>
-      <email>pottlinger@apache.org</email>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Jukka Zitting</name>
-      <email>jukka@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Todd Volkert</name>
-      <email>tvolkert+apache@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Henri Yandell</name>
-      <email>bayard@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Guillaume Nodet</name>
-      <email>gnodet@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Karl Pauls</name>
-      <email>pauls@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Matthieu Riou</name>
-      <email>mriou@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Garrett Rooney</name>
-      <email>rooneg@apache.org</email>
-    </contributor>
-  </contributors>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/creadur/rat/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/creadur/rat/trunk</developerConnection>
-    <url>http://svn.apache.org/repos/asf/creadur/rat/trunk</url>
-  </scm>
-
-  <distributionManagement>
-    <site>
-      <id>${rat.site.id}</id>
-      <name>${rat.site.name}</name>
-      <url>${rat.site.url}</url>
-    </site>
-  </distributionManagement>
-
-  <modules>
-    <module>apache-rat-core</module>
-    <module>apache-rat-plugin</module>
-    <module>apache-rat-tasks</module>
-    <module>apache-rat</module>
-  </modules>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-      <comments>An OSI approved open source license.</comments>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <profiles>
-    <profile>
-       <id>apache-release</id>
-      <build>
-        <plugins>
-          <!-- Skip the source-release artifact here; we create it under the CLI module -->
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>source-release-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <skipAssembly>true</skipAssembly>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>rat</id>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- We don't want this to propagate to the modules, because they all have their own excludes -->
-            <inherited>false</inherited>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <!-- This file only describes how to build the project and it has no license header -->
-                <exclude>BUILD.txt</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+	<prerequisites>
+		<maven>${mavenVersion}</maven>
+	</prerequisites>
+
+	<properties>
+		<javaVersion>1.5</javaVersion>
+		<maven.compiler.source>${javaVersion}</maven.compiler.source>
+		<maven.compiler.target>${javaVersion}</maven.compiler.target>
+		<mavenVersion>2.2.1</mavenVersion>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<!-- Publication to the website is a two phase operation: 1. Deploy to 
+			local stage: mvn site:deploy 2. Publish to Apache CMS: mvn scm-publish:publish-scm 
+			This will only work when the origin for scm-publish:publish-scm is the target 
+			for site:deploy. SO MAKE SURE THAT THE FOLLOWING PROPERTIES RESOLVE TO THE 
+			SAME DIRECTORY: * scmpublish.content * rat.site.url -->
+		<rat.LocalSiteStaging>stage</rat.LocalSiteStaging>
+		<scmpublish.content>${rat.LocalSiteStaging}</scmpublish.content>
+		<rat.site.url>file:${rat.LocalSiteStaging}</rat.site.url>
+		<rat.site.name>Apache Rat Website</rat.site.name>
+		<rat.site.id>org.apache.rat.site</rat.site.id>
+
+		<!-- maven plugin versions -->
+		<surefire.version>2.15</surefire.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-core</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-tasks</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-collections</groupId>
+				<artifactId>commons-collections</artifactId>
+				<version>3.2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<!-- Later versions require Java 1.6+ -->
+				<version>2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>3.3.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>1.5</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.11</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant</artifactId>
+				<version>1.7.1</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-antunit</artifactId>
+				<version>1.1</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-testutil</artifactId>
+				<version>1.7.1</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>${surefire.version}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9.1</version>
+				<configuration>
+					<tagletArtifacts>
+						<tagletArtifact>
+							<groupId>org.apache.maven.plugin-tools</groupId>
+							<artifactId>maven-plugin-tools-javadoc</artifactId>
+							<version>3.3</version>
+						</tagletArtifact>
+					</tagletArtifacts>
+					<tags>
+						<tag>
+							<name>TODO</name>
+							<placement>X</placement>
+							<head>To do:</head>
+						</tag>
+					</tags>
+					<notimestamp>true</notimestamp>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>non-aggregate</id>
+						<configuration>
+						</configuration>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>aggregate</id>
+						<configuration>
+						</configuration>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.3</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>3.0.1</version>
+				<configuration>
+					<targetJdk>${javaVersion}</targetJdk>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.7</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>project-team</report>
+							<report>mailing-list</report>
+							<report>issue-tracking</report>
+							<report>cim</report>
+							<report>license</report>
+							<report>scm</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+
+	<build>
+		<defaultGoal>clean install</defaultGoal>
+		<pluginManagement>
+			<!-- This section is typically used to configure the versions of plugins 
+				that we use. Note, that we are inheriting from the parent POM, so we only 
+				have to configure version numbers, if ours is different. -->
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.ant</groupId>
+							<artifactId>ant</artifactId>
+							<version>1.7.1</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
+					<configuration>
+						<source>${javaVersion}</source>
+						<target>${javaVersion}</target>
+						<encoding>${project.build.sourceEncoding}</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>2.8</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-pmd-plugin</artifactId>
+					<version>3.0.1</version>
+					<configuration>
+						<targetJdk>${javaVersion}</targetJdk>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>${surefire.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.3</version>
+					<configuration>
+						<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+						<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+						<relativizeDecorationLinks>false</relativizeDecorationLinks>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.rat</groupId>
+					<artifactId>apache-rat-plugin</artifactId>
+					<!-- Must use previous version, to avoid a cyclic reference -->
+					<version>0.8</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-scm-publish-plugin</artifactId>
+					<version>1.0-beta-2</version>
+					<extensions>true</extensions>
+					<configuration>
+						<!-- svn location for publication -->
+						<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/creadur/site/trunk/content/rat/</pubScmUrl>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.4.1</version>
+					<configuration>
+						<mavenExecutorId>forked-path</mavenExecutorId>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>pre-site</phase>
+						<id>copy-site-resources</id>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/"
+									failonerror="false" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh</artifactId>
+				<version>1.0-beta-7</version>
+			</extension>
+		</extensions>
+	</build>
+
+	<issueManagement>
+		<system>JIRA</system>
+		<url>https://issues.apache.org/jira/browse/RAT</url>
+	</issueManagement>
+
+	<ciManagement>
+		<system>Buildbot</system>
+		<url>http://ci.apache.org/builders/rat_trunk</url>
+	</ciManagement>
+
+	<mailingLists>
+		<mailingList>
+			<name>Rat Development (Apache Creadur project)</name>
+			<subscribe>dev-subscribe@creadur.apache.org</subscribe>
+			<unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
+			<post>dev@creadur.apache.org</post>
+			<archive>http://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>Rat Commits (Apache Creadur project)</name>
+			<subscribe>commits-subscribe@creadur.apache.org</subscribe>
+			<unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
+		</mailingList>
+	</mailingLists>
+	<developers>
+		<developer>
+			<id>bodewig</id>
+			<name>Stefan Bodewig</name>
+			<email>bodewig@apache.org</email>
+		</developer>
+		<developer>
+			<id>rdonkin</id>
+			<name>Robert Burrell Donkin</name>
+			<email>rdonkin@apache.org</email>
+		</developer>
+		<developer>
+			<id>jochen</id>
+			<name>Jochen Wiedmann</name>
+			<email>jochen@apache.org</email>
+		</developer>
+		<developer>
+			<id>gmcdonald</id>
+			<name>Gavin</name>
+			<email>gmcdonald@apache.org</email>
+		</developer>
+		<developer>
+			<id>brianf</id>
+			<name>Brian Fox</name>
+			<email>brianf@apache.org</email>
+		</developer>
+		<developer>
+			<id>dennisl</id>
+			<name>Dennis Lundberg</name>
+			<email>dennisl@apache.org</email>
+		</developer>
+		<developer>
+			<id>rgardler</id>
+			<name>Ross Gardler</name>
+			<email>rgardler@apache.org</email>
+		</developer>
+		<developer>
+			<id>crossley</id>
+			<name>David Crossley</name>
+			<email>crossley@apache.org</email>
+		</developer>
+		<developer>
+			<id>dblevins</id>
+			<name>David Blevins</name>
+			<email>dblevins@apache.org</email>
+		</developer>
+		<developer>
+			<id>pottlinger</id>
+			<name>Philipp Ottlinger</name>
+			<email>pottlinger@apache.org</email>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Jukka Zitting</name>
+			<email>jukka@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Todd Volkert</name>
+			<email>tvolkert+apache@gmail.com</email>
+		</contributor>
+		<contributor>
+			<name>Henri Yandell</name>
+			<email>bayard@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Guillaume Nodet</name>
+			<email>gnodet@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Karl Pauls</name>
+			<email>pauls@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Matthieu Riou</name>
+			<email>mriou@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Garrett Rooney</name>
+			<email>rooneg@apache.org</email>
+		</contributor>
+	</contributors>
+
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/creadur/rat/trunk</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/creadur/rat/trunk</developerConnection>
+		<url>http://svn.apache.org/repos/asf/creadur/rat/trunk</url>
+	</scm>
+
+	<distributionManagement>
+		<site>
+			<id>${rat.site.id}</id>
+			<name>${rat.site.name}</name>
+			<url>${rat.site.url}</url>
+		</site>
+	</distributionManagement>
+
+	<modules>
+		<module>apache-rat-core</module>
+		<module>apache-rat-plugin</module>
+		<module>apache-rat-tasks</module>
+		<module>apache-rat</module>
+	</modules>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>An OSI approved open source license.</comments>
+		</license>
+	</licenses>
+
+	<organization>
+		<name>Apache Software Foundation</name>
+		<url>http://www.apache.org</url>
+	</organization>
+
+	<profiles>
+		<profile>
+			<id>apache-release</id>
+			<build>
+				<plugins>
+					<!-- Skip the source-release artifact here; we create it under the CLI 
+						module -->
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>source-release-assembly</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<skipAssembly>true</skipAssembly>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rat</id>
+			<build>
+				<plugins>
+					<plugin>
+						<!-- We don't want this to propagate to the modules, because they all 
+							have their own excludes -->
+						<inherited>false</inherited>
+						<groupId>org.apache.rat</groupId>
+						<artifactId>apache-rat-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<!-- This file only describes how to build the project and it has 
+									no license header -->
+								<exclude>BUILD.txt</exclude>
+							</excludes>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>