mirror of https://github.com/apache/maven.git
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
This commit is contained in:
parent
075932b36d
commit
900449d57e
|
@ -69,11 +69,6 @@
|
||||||
<artifactId>commons-cli</artifactId>
|
<artifactId>commons-cli</artifactId>
|
||||||
<version>1.0-beta-2</version>
|
<version>1.0-beta-2</version>
|
||||||
</dependency>
|
</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... -->
|
<!-- TODO: only here for classloader issues. It used to work when the script classes were inside the component factory... -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven</groupId>
|
<groupId>org.apache.maven</groupId>
|
||||||
|
|
|
@ -42,7 +42,6 @@ import org.codehaus.plexus.PlexusContainer;
|
||||||
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
||||||
import org.codehaus.plexus.context.Context;
|
import org.codehaus.plexus.context.Context;
|
||||||
import org.codehaus.plexus.context.ContextException;
|
import org.codehaus.plexus.context.ContextException;
|
||||||
import org.codehaus.plexus.i18n.I18N;
|
|
||||||
import org.codehaus.plexus.logging.AbstractLogEnabled;
|
import org.codehaus.plexus.logging.AbstractLogEnabled;
|
||||||
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
|
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
|
||||||
import org.codehaus.plexus.util.dag.CycleDetectedException;
|
import org.codehaus.plexus.util.dag.CycleDetectedException;
|
||||||
|
@ -68,8 +67,6 @@ public class DefaultMaven
|
||||||
// Components
|
// Components
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
private I18N i18n;
|
|
||||||
|
|
||||||
protected MavenProjectBuilder projectBuilder;
|
protected MavenProjectBuilder projectBuilder;
|
||||||
|
|
||||||
protected LifecycleExecutor lifecycleExecutor;
|
protected LifecycleExecutor lifecycleExecutor;
|
||||||
|
@ -302,7 +299,7 @@ public class DefaultMaven
|
||||||
{
|
{
|
||||||
if ( pom.length() == 0 )
|
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." );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -811,7 +811,6 @@ public class DefaultPluginManager
|
||||||
"plexus-bsh-factory",
|
"plexus-bsh-factory",
|
||||||
"plexus-container-artifact",
|
"plexus-container-artifact",
|
||||||
"plexus-container-default",
|
"plexus-container-default",
|
||||||
"plexus-i18n",
|
|
||||||
"plexus-marmalade-factory",
|
"plexus-marmalade-factory",
|
||||||
"plexus-utils",
|
"plexus-utils",
|
||||||
"wagon-provider-api"
|
"wagon-provider-api"
|
||||||
|
|
|
@ -9,9 +9,6 @@
|
||||||
<role>org.apache.maven.Maven</role>
|
<role>org.apache.maven.Maven</role>
|
||||||
<implementation>org.apache.maven.DefaultMaven</implementation>
|
<implementation>org.apache.maven.DefaultMaven</implementation>
|
||||||
<requirements>
|
<requirements>
|
||||||
<requirement>
|
|
||||||
<role>org.codehaus.plexus.i18n.I18N</role>
|
|
||||||
</requirement>
|
|
||||||
<requirement>
|
<requirement>
|
||||||
<role>org.apache.maven.project.MavenProjectBuilder</role>
|
<role>org.apache.maven.project.MavenProjectBuilder</role>
|
||||||
</requirement>
|
</requirement>
|
||||||
|
@ -54,18 +51,6 @@
|
||||||
<role-hint>InvalidArtifactDiagnoser</role-hint>
|
<role-hint>InvalidArtifactDiagnoser</role-hint>
|
||||||
<implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
|
<implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
|
||||||
</component>
|
</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>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|
|
|
||||||
|
|
Loading…
Reference in New Issue