svn commit: r1781702 - in /maven/shared/trunk/maven-reporting-impl: ./ src/main/java/org/apache/maven/reporting/ src/test/java/org/apache/maven/reporting/

[michaelo]

Author: michaelo
Date: Sat Feb  4 20:15:14 2017
New Revision: 1781702

URL: http://svn.apache.org/viewvc?rev=1781702&view=rev
Log:
[MSHARED-611] Drop any href validation and pass as-is

Removed:
    
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/UrlValidationUtil.java
    
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/UrlValidationUtilTest.java
Modified:
    maven/shared/trunk/maven-reporting-impl/pom.xml
    
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java

Modified: maven/shared/trunk/maven-reporting-impl/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=1781702&r1=1781701&r2=1781702&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-impl/pom.xml (original)
+++ maven/shared/trunk/maven-reporting-impl/pom.xml Sat Feb  4 20:15:14 2017
@@ -121,11 +121,6 @@
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-validator</groupId>
-      <artifactId>commons-validator</artifactId>
-      <version>1.5.1</version>
-    </dependency>
 
     <!-- test -->
     <dependency>

Modified: 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=1781702&r1=1781701&r2=1781702&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
 (original)
+++ 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
 Sat Feb  4 20:15:14 2017
@@ -19,8 +19,6 @@ package org.apache.maven.reporting;
  * under the License.
  */
 
-import org.apache.commons.validator.routines.EmailValidator;
-
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.util.HtmlTools;
 
@@ -30,7 +28,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
@@ -529,14 +526,7 @@ public abstract class AbstractMavenRepor
                     }
                     else
                     {
-                        if ( getValidHref( href ) != null )
-                        {
-                            link( getValidHref( href ), name );
-                        }
-                        else
-                        {
-                            text( href );
-                        }
+                       link( href, name );
                     }
                 }
             }
@@ -601,51 +591,6 @@ public abstract class AbstractMavenRepor
     // ----------------------------------------------------------------------
 
     /**
-     * Return a valid href.
-     * <p>A valid href could start by <code>mailto:</code>.</p>
-     * <p>For a relative path, the href should start by <code>./</code> to be 
valid.</p>
-     *
-     * @param href an href, could be null.
-     * @return a valid href or <code>null</code> if the href is null or not 
valid.
-     */
-    private static String getValidHref( String href )
-    {
-        if ( StringUtils.isEmpty( href ) )
-        {
-            return null;
-        }
-
-        href = href.trim();
-
-        EmailValidator emailValidator = EmailValidator.getInstance();
-
-        if ( emailValidator.isValid( href )
-            || ( href.contains( "?" ) && emailValidator.isValid( 
href.substring( 0, href.indexOf( "?" ) ) ) ) )
-        {
-            return "mailto:"; + href;
-        }
-        else if ( href.toLowerCase( Locale.ROOT ).startsWith( "mailto:"; ) )
-        {
-            return href;
-        }
-        else if ( UrlValidationUtil.isValidUrl( href ) )
-        {
-            return href;
-        }
-        else if ( href.startsWith( "./" ) )
-        {
-            if ( href.length() > 2 )
-            {
-                return href.substring( 2, href.length() );
-            }
-
-            return ".";
-        }
-
-        return null;
-    }
-
-    /**
      * The method parses a text and applies the given pattern <code>{text, 
url}</code> to create
      * a list of text/href.
      *