svn commit: r1799998 - in /maven/enforcer/trunk/enforcer-rules: pom.xml src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java

[gboue]

Author: gboue
Date: Mon Jun 26 21:36:41 2017
New Revision: 1799998

URL: http://svn.apache.org/viewvc?rev=1799998&view=rev
Log:
Clean up plexus-i18n dependency, and the code looking the I18N component, since 
it is never used.

Modified:
    maven/enforcer/trunk/enforcer-rules/pom.xml
    
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
    
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1799998&r1=1799997&r2=1799998&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Jun 26 21:36:41 2017
@@ -90,11 +90,6 @@
       <artifactId>maven-dependency-tree</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-i18n</artifactId>
-      <version>1.0-beta-6</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
     </dependency>

Modified: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1799998&r1=1799997&r2=1799998&view=diff
==============================================================================
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
 Mon Jun 26 21:36:41 2017
@@ -40,7 +40,6 @@ import org.apache.maven.shared.dependenc
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
 
 /**
  * @author <a href="mailto:r...@e-hoffman.org";>Rex Hoffman</a>
@@ -51,8 +50,6 @@ public class DependencyConvergence
 
     private static Log log;
 
-    private static I18N i18n;
-
     private boolean uniqueVersions;
 
     public void setUniqueVersions( boolean uniqueVersions )
@@ -113,10 +110,6 @@ public class DependencyConvergence
         }
         try
         {
-            if ( i18n == null )
-            {
-                i18n = (I18N) helper.getComponent( I18N.class );
-            }
             DependencyNode node = getNode( helper );
             DependencyVersionMap visitor = new DependencyVersionMap( log );
             visitor.setUniqueVersions( uniqueVersions );
@@ -133,10 +126,6 @@ public class DependencyConvergence
                     + "See above detailed error message." );
             }
         }
-        catch ( ComponentLookupException e )
-        {
-            throw new EnforcerRuleException( "Unable to lookup a component " + 
e.getLocalizedMessage(), e );
-        }
         catch ( Exception e )
         {
             throw new EnforcerRuleException( e.getLocalizedMessage(), e );

Modified: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=1799998&r1=1799997&r2=1799998&view=diff
==============================================================================
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
 Mon Jun 26 21:36:41 2017
@@ -44,7 +44,6 @@ import org.apache.maven.shared.dependenc
 import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
 
 /**
  * Rule to enforce that the resolved dependency is also the most recent one of 
all transitive dependencies.
@@ -57,8 +56,6 @@ public class RequireUpperBoundDeps
 {
     private static Log log;
 
-    private static I18N i18n;
-
     /**
      * @since 1.3
      */
@@ -145,10 +142,6 @@ public class RequireUpperBoundDeps
         }
         try
         {
-            if ( i18n == null )
-            {
-                i18n = (I18N) helper.getComponent( I18N.class );
-            }
             DependencyNode node = getNode( helper );
             RequireUpperBoundDepsVisitor visitor = new 
RequireUpperBoundDepsVisitor();
             visitor.setUniqueVersions( uniqueVersions );
@@ -160,10 +153,6 @@ public class RequireUpperBoundDeps
                     + errorMessages );
             }
         }
-        catch ( ComponentLookupException e )
-        {
-            throw new EnforcerRuleException( "Unable to lookup a component " + 
e.getLocalizedMessage(), e );
-        }
         catch ( Exception e )
         {
             throw new EnforcerRuleException( e.getLocalizedMessage(), e );