creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1391861 - in /creadur/rat/trunk: ./ apache-rat-plugin/ apache-rat-plugin/src/main/java/org/apache/rat/mp/ apache-rat-plugin/src/test/invoker/it1/
Date Sat, 29 Sep 2012 18:54:25 GMT
Author: rdonkin
Date: Sat Sep 29 18:54:24 2012
New Revision: 1391861

URL: http://svn.apache.org/viewvc?rev=1391861&view=rev
Log:
RAT-122 Maven Plugin: field to ignore errors and continue the build; RAT-121 use maven java5
annotations for maven plugins; RAT-120 fix some maven warning and upgrade some dependencies.
Many thanks to Olivier Lamy

Added:
    creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.groovy
Removed:
    creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh
Modified:
    creadur/rat/trunk/RELEASE_NOTES.txt
    creadur/rat/trunk/apache-rat-plugin/pom.xml
    creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
    creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
    creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.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=1391861&r1=1391860&r2=1391861&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Sat Sep 29 18:54:24 2012
@@ -11,6 +11,9 @@ RAT 0.9
     * RAT-111 Files generated by javah are now detected as generated
       files that don't require a license.
     * RAT-49 MIT license is now detected and approved by default
+    * RAT-122 Maven Plugin: field to ignore errors and continue the build
+    * RAT-121 use maven java5 annotations for maven plugins
+    * RAT-120 fix some maven warning and upgrade some dependencies.
 
 RAT 0.8
 =======
@@ -77,16 +80,16 @@ RAT 0.6
  * Moved to the Incubator@Apache
  * Issues Resolved (see http://issues.apache.org/jira):
   * Bug:
-    * RAT-3 Incorrect alignment of file contents 
+    * RAT-3 Incorrect alignment of file contents
     * RAT-11 Incorrect number of unnapproved licences reported
-    * RAT-12 Incorrect SCM info in maven plugin pom 
+    * RAT-12 Incorrect SCM info in maven plugin pom
     * RAT-29 NPE on "mvn install" in rat-anttasks
     * RAT-33 Mailing list subscribe points to unsubscribe
     * RAT-34 No license header added for java files that do not contain project line
     * RAT-35 Incorrect number of unapproved licenses reported by rat:check
-    * RAT-36 Report header incorrectly refers to an "L" license marker

+    * RAT-36 Report header incorrectly refers to an "L" license marker
   * Improvement:
-    * RAT-8 [PATCH] add JavaCC to GeneratedLicenseNotRequired 
+    * RAT-8 [PATCH] add JavaCC to GeneratedLicenseNotRequired
     * RAT-9 A more informative website
     * RAT-10 A few Javadoc comments
     * RAT-23  More details in text summary
@@ -95,9 +98,9 @@ RAT 0.6
     * RAT-27 Index page
     * RAT-37 List all resources with unapproved licenses at the beginning of the report
   * New Feature
-    * RAT-6 RAT Source Import    
+    * RAT-6 RAT Source Import
   * Task
-    * RAT-28 Repackage maven plugin          
+    * RAT-28 Repackage maven plugin
   * Wish
     * RAT-1 maven-rat-plugin and ant-rat tasks
 
@@ -105,18 +108,18 @@ RAT 0.5.1
 =========
  * Fixed file closing bug
  * Fixed XML bad character bug
- 
+
 RAT 0.5
 =======
  * Added header matcher for DoJo.
- * Refactoring existing codebase to separate concerns and use 
+ * Refactoring existing codebase to separate concerns and use
    resource pipeline.
  * New header matching library.
 
 RAT 0.4.1
 =========
 RAT 0.4.1 is the first release with distributions. The release was cut
-for this purpose. 
+for this purpose.
 
 RAT 0.4.1 Notes
 ===============
@@ -128,14 +131,14 @@ RAT 0.4 Notes
  * Ant tasks added. These allow RAT reports to be run against a wide variety
    of resources from within Ant.
  * Legacy report is now deprecated. It will be removed before the next release.
- * Created stylesheet for xml reports which produce output similar to the legacy 
+ * Created stylesheet for xml reports which produce output similar to the legacy
    plain text report. Application now uses the xml report with that stylesheet.
  * Revised xml output format
  * Improve support for binary recognition by adding code that tastes files
 
 RAT 0.3 Notes
 =============
- * This is the last release with the original hacked together plain test report. 
+ * This is the last release with the original hacked together plain test report.
    The new XML reporting code is present but is not yet the default.
  * RAT 0.3 is the first release with release notes. All previous releases are
    now consigned to Ancient History. No record of them will be found here.

Modified: creadur/rat/trunk/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/pom.xml?rev=1391861&r1=1391860&r2=1391861&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/pom.xml Sat Sep 29 18:54:24 2012
@@ -36,6 +36,7 @@
     <currentVersion>${project.version}</currentVersion>
     <doxiaVersion>1.0-alpha-8</doxiaVersion>
     <doxiaSitetoolsVersion>1.0-alpha-8</doxiaSitetoolsVersion>
+    <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
   </properties>
   
   <build>
@@ -57,11 +58,43 @@
         </includes>
       </resource>
     </resources>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${mavenPluginPluginVersion}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
+        <configuration>
+          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+        </configuration>
+        <executions>
+          <execution>
+            <id>mojo-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+          <!-- to generate help goal -->
+          <execution>
+            <id>help-goal</id>
+            <goals>
+              <goal>helpmojo</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>1.5</version>
+        <version>1.6</version>
         <configuration>
           <projectsDirectory>src/test/invoker</projectsDirectory>
           <cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
@@ -70,7 +103,7 @@
           </pomIncludes>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/test/invoker/settings.xml</settingsFile>
-          <postBuildHookScript>verify.bsh</postBuildHookScript>
+          <postBuildHookScript>verify</postBuildHookScript>
         </configuration>
         <executions>
           <execution>
@@ -96,6 +129,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>${mavenPluginPluginVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
@@ -166,7 +205,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4</version>
+      <version>3.0.8</version>
     </dependency>
   </dependencies>
 
@@ -179,6 +218,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
       </plugin>
     </plugins>
   </reporting>

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=1391861&r1=1391860&r2=1391861&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
Sat Sep 29 18:54:24 2012
@@ -22,6 +22,8 @@ package org.apache.rat.mp;
 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;
 import org.apache.rat.Report;
@@ -72,25 +74,25 @@ public abstract class AbstractRatMojo ex
     /**
      * The base directory, in which to search for files.
      * 
-     * @parameter expression="${rat.basedir}" default-value="${basedir}"
-     * @required
      */
+    @Parameter (property = "rat.basedir", defaultValue = "${basedir}", required = true)
     protected File basedir;
 
     /**
      * Specifies the licenses to accept. Deprecated, use {@link #licenses} instead.
      * 
-     * @parameter
      * @deprecated Use {@link #licenses} instead.
      */
+    @Parameter
     private HeaderMatcherSpecification[] licenseMatchers;
 
     /**
      * Specifies the licenses to accept. By default, these are added to the default
      * licenses, unless you set {@link #addDefaultLicenseMatchers} to true.
-     * @parameter
+     *
      * @since 0.8
      */
+    @Parameter
     private IHeaderMatcher[] licenses;
 
     /**
@@ -101,45 +103,46 @@ public abstract class AbstractRatMojo ex
 
     /**
      * Specifies the license families to accept.
-     * @parameter
+     *
      * @since 0.8
      */
+    @Parameter
     private ILicenseFamily[] licenseFamilies;
     
     /**
      * Whether to add the default list of license matchers.
      * 
-     * @parameter expression="${rat.addDefaultLicenseMatchers}" default-value="true"
      */
+    @Parameter(property = "rat.addDefaultLicenseMatchers", defaultValue = "true")
     private boolean addDefaultLicenseMatchers;
 
     /**
      * Specifies files, which are included in the report. By default, all files are included.
      * 
-     * @parameter
      */
+    @Parameter
     private String[] includes;
 
     /**
      * Specifies files, which are excluded in the report. By default, no files are excluded.
      * 
-     * @parameter
      */
+    @Parameter
     private String[] excludes;
 
     /**
      * Whether to use the default excludes when scanning for files.
      * 
-     * @parameter expression="${rat.useDefaultExcludes}" default-value="true"
      */
+    @Parameter(property = "rat.useDefaultExcludes", defaultValue = "true")
     private boolean useDefaultExcludes;
 
     /**
      * Whether to use the Maven specific default excludes when scanning for files. Maven
specific default excludes are
      * given by the constant MAVEN_DEFAULT_EXCLUDES: The target directory, the cobertura.ser
file, and so on.
      * 
-     * @parameter expression="${rat.useMavenDefaultExcludes}" default-value="true"
      */
+    @Parameter(property = "rat.useMavenDefaultExcludes", defaultValue = "true")
     private boolean useMavenDefaultExcludes;
 
     /**
@@ -147,31 +150,30 @@ public abstract class AbstractRatMojo ex
      * are given by the constant ECLIPSE_DEFAULT_EXCLUDES: The .classpath and .project files,
the .settings directory,
      * and so on.
      * 
-     * @parameter expression="${rat.useEclipseDefaultExcludes}" default-value="true"
      */
+    @Parameter(property = "rat.useEclipseDefaultExcludes", defaultValue = "true")
     private boolean useEclipseDefaultExcludes;
 
     /**
      * Whether to use the IDEA specific default excludes when scanning for files. IDEA specific
default excludes are
      * given by the constant IDEA_DEFAULT_EXCLUDES: The *.iml, *.ipr and *.iws files.
      * 
-     * @parameter expression="${rat.useIdeaDefaultExcludes}" default-value="true"
      */
+    @Parameter(property = "rat.useIdeaDefaultExcludes", defaultValue = "true")
     private boolean useIdeaDefaultExcludes;
 
     /**
      * Whether to exclude subprojects. This is recommended, if you want a
      * separate apache-rat-plugin report for each subproject.
      * 
-     * @parameter expression="${rat.excludeSubprojects}" default-value="true"
      */
+    @Parameter(property = "rat.excludeSubprojects", defaultValue = "true")
     private boolean excludeSubProjects;
     
     /**
-     * @parameter default-value="${project}"
-     * @required
-     * @readonly
+     *
      */
+    @Component
     private MavenProject project;
 
     /**
@@ -203,7 +205,7 @@ public abstract class AbstractRatMojo ex
         {
             for (final HeaderMatcherSpecification spec : licenseMatchers) {
                 final String className = spec.getClassName();
-                final IHeaderMatcher headerMatcher = (IHeaderMatcher) newInstance(IHeaderMatcher.class,
className);
+                final IHeaderMatcher headerMatcher = newInstance(IHeaderMatcher.class, className);
                 list.add(headerMatcher);
             }
         }
@@ -215,14 +217,14 @@ public abstract class AbstractRatMojo ex
         return (IHeaderMatcher[]) list.toArray( new IHeaderMatcher[list.size()] );
     }
 
-    private Object newInstance( final Class clazz, final String className )
+    private <T> T newInstance( final Class<T> clazz, final String className )
         throws MojoExecutionException, MojoFailureException
     {
-        final Object o;
+        final T o;
         try
         {
             final ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            o = cl.loadClass( className ).newInstance();
+            o = (T) cl.loadClass( className ).newInstance();
         }
         catch ( InstantiationException e )
         {

Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java?rev=1391861&r1=1391860&r2=1391861&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
(original)
+++ creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
Sat Sep 29 18:54:24 2012
@@ -28,47 +28,49 @@ import java.io.InputStream;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.report.claim.ClaimStatistic;
 
 /**
  * Run RAT to perform a violation check.
- * 
- * @goal check
- * @phase verify
+ *
  */
+@Mojo (name = "check", defaultPhase = LifecyclePhase.VERIFY)
 public class RatCheckMojo extends AbstractRatMojo
 {
     /**
      * Where to store the report.
-     * 
-     * @parameter expression="${rat.outputFile}" default-value="${project.build.directory}/rat.txt"
+     *
      */
+    @Parameter (property = "rat.outputFile", defaultValue = "${project.build.directory}/rat.txt")
     private File reportFile;
 
     /**
      * Output style of the report. Use "plain" (the default) for a plain text
      * report or "xml" for the raw XML report. Alternatively you can give the
      * path of an XSL transformation that will be applied on the raw XML to
-     * produce the report written to the output file. 
-     * 
-     * @parameter expression="${rat.outputStyle}" default-value="plain"
+     * produce the report written to the output file.
+     *
      */
+    @Parameter(property = "rat.outputStyle", defaultValue = "plain")
     private String reportStyle;
 
     /**
      * Maximum number of files with unapproved licenses.
-     * @parameter expression="${rat.numUnapprovedLicenses}" default-value="0"
      */
+    @Parameter(property = "rat.numUnapprovedLicenses", defaultValue = "0")
     private int numUnapprovedLicenses;
 
     /**
      * Whether to add license headers; possible values are
      * {@code forced}, {@code true}, and {@code false} (default).
      *
-     * @parameter expression="${rat.addLicenseHeaders}" default-value="false"
      */
+    @Parameter(property = "rat.addLicenseHeaders", defaultValue = "false")
     private String addLicenseHeaders;
 
     /**
@@ -76,10 +78,18 @@ public class RatCheckMojo extends Abstra
      * ignored, unless {@code addLicenseHeaders} is set to {@code true},
      * or {@code forced}.
      *
-     * @parameter expression="${rat.copyrightMessage}"
      */
+    @Parameter(property = "rat.copyrightMessage")
     private String copyrightMessage;
 
+    /**
+     * Will ignore rat errors and display a log message if any.
+     * Its use is NOT RECOMMENDED, but quite convenient on occasion.
+     * @since 0.9
+     */
+    @Parameter(property = "rat.ignoreErrors", defaultValue = "false")
+    private boolean ignoreErrors;
+
     private ClaimStatistic getRawReport()
         throws MojoExecutionException, MojoFailureException
     {
@@ -144,7 +154,7 @@ public class RatCheckMojo extends Abstra
 
     /**
      * Invoked by Maven to execute the Mojo.
-     * 
+     *
      * @throws MojoFailureException
      *             An error in the plugin configuration was detected.
      * @throws MojoExecutionException
@@ -166,8 +176,18 @@ public class RatCheckMojo extends Abstra
     {
         if ( numUnapprovedLicenses < statistics.getNumUnApproved() )
         {
-            throw new RatCheckException( "Too many unapproved licenses: " + statistics.getNumUnApproved()
);
+            if ( !ignoreErrors )
+            {
+                throw new RatCheckException( "Too many unapproved licenses: " + statistics.getNumUnApproved()
);
+            }
+            else
+            {
+                getLog().warn( "Rat check:" + statistics.getNumUnApproved() + " errors on
non approved has been ignored." );
+            }
+
         }
+
+
     }
 
     protected ReportConfiguration getConfiguration()

Modified: creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java?rev=1391861&r1=1391860&r2=1391861&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
(original)
+++ creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
Sat Sep 29 18:54:24 2012
@@ -37,6 +37,10 @@ import org.apache.maven.doxia.siterender
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 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.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.rat.Defaults;
@@ -58,39 +62,27 @@ import java.util.ResourceBundle;
 /**
  * Generates a report with RAT's output.
  * 
- * @goal rat
- * @requiresDependencyResolution test
  */
+@Mojo(name = "rat", requiresDependencyResolution = ResolutionScope.TEST)
 public class RatReportMojo extends AbstractRatMojo implements MavenReport
 {
     /**
      * Specifies the directory where the report will be generated
      * 
-     * @parameter default-value="${project.reporting.outputDirectory}"
-     * @required
      */
+    @Parameter(defaultValue = "${project.reporting.outputDirectory}", required = true)
     private File outputDirectory;
 
-    /**
-     * @component
-     */
+    @Component
     private Renderer siteRenderer;
 
-    /**
-     * @component
-     */
+    @Component
     private ArtifactFactory factory;
 
-    /**
-     * @component
-     */
+    @Component
     private ArtifactResolver resolver;
 
-    /**
-     * @parameter default-value="${localRepository}"
-     * @required
-     * @readonly
-     */
+    @Parameter(defaultValue = "${localRepository}", required = true, readonly = true)
     private ArtifactRepository localRepository;
 
     /**

Added: creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.groovy
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.groovy?rev=1391861&view=auto
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.groovy (added)
+++ creadur/rat/trunk/apache-rat-plugin/src/test/invoker/it1/verify.groovy Sat Sep 29 18:54:24
2012
@@ -0,0 +1,3 @@
+content = new File( basedir, 'target/rat.txt' ).text;
+
+assert content.contains( 'YAL__ src.apt' );
\ No newline at end of file

Modified: creadur/rat/trunk/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1391861&r1=1391860&r2=1391861&view=diff
==============================================================================
--- creadur/rat/trunk/pom.xml (original)
+++ creadur/rat/trunk/pom.xml Sat Sep 29 18:54:24 2012
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?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
@@ -14,8 +14,7 @@
   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">
+--><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>
@@ -82,6 +81,10 @@ agnostic home for software distribution 
     <rat.snapshots.id>apache.snapshots.https</rat.snapshots.id>
     <rat.snapshots.name>${distMgmtSnapshotsName}</rat.snapshots.name> <!--
Parent POM uses these properties -->
     <rat.snapshots.url>${distMgmtSnapshotsUrl}</rat.snapshots.url>
+
+    <!-- maven plugn versions -->
+    <surefire.version>2.12.3</surefire.version>
+
   </properties>
 
   <dependencyManagement>
@@ -153,7 +156,7 @@ agnostic home for software distribution 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.5</version>
+        <version>${surefire.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -267,6 +270,11 @@ agnostic home for software distribution 
           </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.1</version>
@@ -291,7 +299,7 @@ agnostic home for software distribution 
             </goals>
             <configuration>
               <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/"
failonerror="false" />
+                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/"
failonerror="false"/>
               </target>
             </configuration>
           </execution>
@@ -459,4 +467,4 @@ agnostic home for software distribution 
   	<name>Apache Software Foundation</name>
   	<url>http://www.apache.org</url>
   </organization>
-</project>
+</project>
\ No newline at end of file



Mime
View raw message