From 900449d57e7700b3dd12b9b8f18a24baa2ca6f84 Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
Date: Sun, 5 Jun 2005 15:21:52 +0000
Subject: [PATCH] Remove plexus-i18n from core for use it in plugins, site and
 reports

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180100 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml                                |  5 -----
 .../main/java/org/apache/maven/DefaultMaven.java  |  5 +----
 .../apache/maven/plugin/DefaultPluginManager.java |  1 -
 .../main/resources/META-INF/plexus/components.xml | 15 ---------------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 058572dda0..2ad4a97eaf 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -69,11 +69,6 @@
       <artifactId>commons-cli</artifactId>
       <version>1.0-beta-2</version>
     </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-i18n</artifactId>
-      <version>1.0-beta-4</version>
-    </dependency>
     <!-- TODO: only here for classloader issues. It used to work when the script classes were inside the component factory... -->
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index ad5e683b52..d48befc3da 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -42,7 +42,6 @@ import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -68,8 +67,6 @@ public class DefaultMaven
     // Components
     // ----------------------------------------------------------------------
 
-    private I18N i18n;
-
     protected MavenProjectBuilder projectBuilder;
 
     protected LifecycleExecutor lifecycleExecutor;
@@ -302,7 +299,7 @@ public class DefaultMaven
         {
             if ( pom.length() == 0 )
             {
-                throw new ProjectBuildingException( i18n.format( "empty.descriptor.error", pom ) );
+                throw new ProjectBuildingException( "The file " + pom.getAbsolutePath() + " you specified has zero length." );
             }
         }
 
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index 35bb5865de..39f5d16864 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -811,7 +811,6 @@ public class DefaultPluginManager
             "plexus-bsh-factory",
             "plexus-container-artifact",
             "plexus-container-default",
-            "plexus-i18n",
             "plexus-marmalade-factory",
             "plexus-utils",
             "wagon-provider-api"
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 5feb10e4d4..adc773ac3c 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -9,9 +9,6 @@
       <role>org.apache.maven.Maven</role>
       <implementation>org.apache.maven.DefaultMaven</implementation>
       <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.i18n.I18N</role>
-        </requirement>
         <requirement>
           <role>org.apache.maven.project.MavenProjectBuilder</role>
         </requirement>
@@ -54,18 +51,6 @@
       <role-hint>InvalidArtifactDiagnoser</role-hint>
       <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
     </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.codehaus.plexus.i18n.I18N</role>
-      <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
-      <configuration>
-        <default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
-      </configuration>
-    </component>
 
     <!--
      |