creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pottlin...@apache.org
Subject svn commit: r1659945 - in /creadur/rat/trunk: ./ apache-rat-plugin/ apache-rat-plugin/src/main/java/org/apache/rat/mp/
Date Sun, 15 Feb 2015 16:38:56 GMT
Author: pottlinger
Date: Sun Feb 15 16:38:56 2015
New Revision: 1659945

URL: http://svn.apache.org/r1659945
Log:
RAT-194: Apply patch given from Jira.

- Thanks to Hervé Boutemy.

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=1659945&r1=1659944&r2=1659945&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Sun Feb 15 16:38:56 2015
@@ -18,6 +18,8 @@ Rat 0.12 (SNAPSHOT)
                   Workaround for https://jira.codehaus.org/browse/MANIMALSNIFFER-45
                   (thanks to Mark Thomas)
    Improvement
+    * [RAT-194] - Upgrade to Doxia 1.6 if called directly, does not affect problems reported
in RAT-158. Minor improvements.
+                  (thanks to Hervé Boutemy)
     * [RAT-61]  - List files with unapproved licenses in Maven output
     * [RAT-170] - RAT should use itself during build and site generation
     * [RAT-181] - BinaryGuesser should treat *.truststore as binary

Modified: creadur/rat/trunk/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/pom.xml?rev=1659945&r1=1659944&r2=1659945&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-plugin/pom.xml (original)
+++ creadur/rat/trunk/apache-rat-plugin/pom.xml Sun Feb 15 16:38:56 2015
@@ -33,8 +33,8 @@
   </prerequisites>
   <properties>
     <currentVersion>${project.version}</currentVersion>
-    <doxiaVersion>1.2</doxiaVersion>
-    <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
+    <doxiaVersion>1.6</doxiaVersion>
+    <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
   </properties>
   <build>
     <resources>

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=1659945&r1=1659944&r2=1659945&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
Sun Feb 15 16:38:56 2015
@@ -19,6 +19,7 @@ package org.apache.rat.mp;
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -37,6 +38,7 @@ import org.apache.rat.report.claim.Claim
 import org.codehaus.plexus.util.DirectoryScanner;
 
 import javax.xml.transform.TransformerConfigurationException;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -411,28 +413,8 @@ public abstract class AbstractRatMojo ex
         }
         finally
         {
-            if ( pw != null )
-            {
-                try
-                {
-                    pw.close();
-                }
-                catch ( Throwable t )
-                {
-                    // Ignore me
-                }
-            }
-            if ( sw != null )
-            {
-                try
-                {
-                    sw.close();
-                }
-                catch ( Throwable t )
-                {
-                    // Ignore me
-                }
-            }
+            IOUtils.closeQuietly( pw );
+            IOUtils.closeQuietly( sw );
         }
     }
 

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=1659945&r1=1659944&r2=1659945&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
Sun Feb 15 16:38:56 2015
@@ -26,6 +26,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -116,17 +117,7 @@ public class RatCheckMojo extends Abstra
         }
         finally
         {
-            if ( fw != null )
-            {
-                try
-                {
-                    fw.close();
-                }
-                catch ( Throwable t )
-                {
-                    /* Ignore me */
-                }
-            }
+            IOUtils.closeQuietly( fw );
         }
     }
 

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=1659945&r1=1659944&r2=1659945&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
Sun Feb 15 16:38:56 2015
@@ -37,12 +37,12 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.site.decoration.Body;
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.doxia.site.decoration.Skin;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.RenderingContext;
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.plugin.MojoExecutionException;

Modified: creadur/rat/trunk/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1659945&r1=1659944&r2=1659945&view=diff
==============================================================================
--- creadur/rat/trunk/pom.xml (original)
+++ creadur/rat/trunk/pom.xml Sun Feb 15 16:38:56 2015
@@ -161,13 +161,6 @@ agnostic home for software distribution
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <tagletArtifacts>
-            <tagletArtifact>
-              <groupId>org.apache.maven.plugin-tools</groupId>
-              <artifactId>maven-plugin-tools-javadoc</artifactId>
-              <version>${mavenPluginPluginVersion}</version>
-            </tagletArtifact>
-          </tagletArtifacts>
           <tags>
             <tag>
               <name>TODO</name>



Mime
View raw message