Author: brett
Date: Thu Sep 15 18:11:42 2005
New Revision: 289355
URL: http://svn.apache.org/viewcvs?rev=289355&view=rev
Log:
finish correcting spelling of prerequisites
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=289355&r1=289354&r2=289355&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Sep 15 18:11:42 2005
@@ -136,7 +136,7 @@
List files = getProjectFiles( request );
List projects = collectProjects( files,
request.getLocalRepository(), request.isRecursive(),
- request.getSettings(),
globalProfileManager );
+ request.getSettings(),
globalProfileManager );
// the reasoning here is that the list is still unsorted according
to dependency, so the first project
// SHOULD BE the top-level, or the one we want to start with if
we're doing an aggregated build.
@@ -193,7 +193,8 @@
// TODO: yuck! Revisit when cleaning up the exception
handling from the top down
Throwable exception = response.getException();
- if ( ReactorManager.FAIL_AT_END.equals(
rm.getFailureBehavior() ) && ( exception instanceof ReactorException ) )
+ if ( ReactorManager.FAIL_AT_END.equals(
rm.getFailureBehavior() ) &&
+ ( exception instanceof ReactorException ) )
{
logFailure( response, exception, null );
@@ -311,7 +312,8 @@
getLogger().info( messageBuffer.toString() );
}
- private MavenExecutionResponse dispatchErrorResponse( EventDispatcher
dispatcher, String event, String baseDirectory, Exception e )
+ private MavenExecutionResponse dispatchErrorResponse( EventDispatcher
dispatcher, String event,
+ String
baseDirectory, Exception e )
{
dispatcher.dispatchError( event, baseDirectory, e );
@@ -325,8 +327,9 @@
}
private List collectProjects( List files, ArtifactRepository
localRepository, boolean recursive, Settings settings,
- ProfileManager globalProfileManager )
- throws ProjectBuildingException, ReactorException, IOException,
ArtifactResolutionException, ProfileActivationException
+ ProfileManager globalProfileManager )
+ throws ProjectBuildingException, ReactorException, IOException,
ArtifactResolutionException,
+ ProfileActivationException
{
List projects = new ArrayList( files.size() );
@@ -341,9 +344,9 @@
MavenProject project = getProject( file, localRepository,
settings, globalProfileManager );
- if ( project.getPrerequesites() != null &&
project.getPrerequesites().getMaven() != null )
+ if ( project.getPrerequisites() != null &&
project.getPrerequisites().getMaven() != null )
{
- DefaultArtifactVersion version = new DefaultArtifactVersion(
project.getPrerequesites().getMaven() );
+ DefaultArtifactVersion version = new DefaultArtifactVersion(
project.getPrerequisites().getMaven() );
if ( runtimeInformation.getApplicationVersion().compareTo(
version ) < 0 )
{
throw new ProjectBuildingException( "Unable to build
project '" + project.getFile() +
@@ -366,7 +369,8 @@
moduleFiles.add( new File( basedir, name + "/pom.xml" ) );
}
- List collectedProjects = collectProjects( moduleFiles,
localRepository, recursive, settings, globalProfileManager );
+ List collectedProjects = collectProjects( moduleFiles,
localRepository, recursive, settings,
+ globalProfileManager
);
projects.addAll( collectedProjects );
project.setCollectedProjects( collectedProjects );
}
@@ -377,7 +381,7 @@
}
public MavenProject getProject( File pom, ArtifactRepository
localRepository, Settings settings,
- ProfileManager globalProfileManager )
+ ProfileManager globalProfileManager )
throws ProjectBuildingException, ArtifactResolutionException,
ProfileActivationException
{
if ( pom.exists() )
@@ -426,8 +430,7 @@
protected MavenSession createSession( MavenExecutionRequest request,
ReactorManager rpm )
{
return new MavenSession( container, request.getSettings(),
request.getLocalRepository(),
- request.getEventDispatcher(), rpm,
request.getGoals(),
- request.getBaseDirectory() );
+ request.getEventDispatcher(), rpm,
request.getGoals(), request.getBaseDirectory() );
}
/**
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=289355&r1=289354&r2=289355&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Sep 15 18:11:42 2005
@@ -231,10 +231,10 @@
MavenProject project = mavenProjectBuilder.buildFromRepository(
artifact, remoteRepositories,
localRepository );
// if we don't have the required Maven version, then ignore an
update
- if ( project.getPrerequesites() != null &&
project.getPrerequesites().getMaven() != null )
+ if ( project.getPrerequisites() != null &&
project.getPrerequisites().getMaven() != null )
{
DefaultArtifactVersion requiredVersion = new
DefaultArtifactVersion(
- project.getPrerequesites().getMaven() );
+ project.getPrerequisites().getMaven() );
if ( runtimeInformation.getApplicationVersion().compareTo(
requiredVersion ) < 0 )
{
throw new PluginVersionResolutionException(
plugin.getGroupId(), plugin.getArtifactId(),
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=289355&r1=289354&r2=289355&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Thu Sep 15 18:11:42 2005
@@ -79,7 +79,7 @@
{
return resolvePluginVersion( groupId, artifactId, project, settings,
localRepository, false );
}
-
+
public String resolvePluginVersion( String groupId, String artifactId,
MavenProject project, Settings settings,
ArtifactRepository localRepository,
boolean resolveAsReportPlugin )
throws PluginVersionResolutionException
@@ -148,9 +148,10 @@
// are we using the LATEST metadata to resolve plugin version?
Boolean rtCheckLatest = settingsRTInfo.getCheckLatestPluginVersion();
- boolean checkLatestMetadata = Boolean.TRUE.equals( rtCheckLatest ) ||
- ( !Boolean.FALSE.equals( rtCheckLatest ) && Boolean.valueOf(
getPluginRegistry( groupId, artifactId ).getCheckLatest() )
- .booleanValue() );
+ boolean checkLatestMetadata = Boolean.TRUE.equals( rtCheckLatest ) || (
+ !Boolean.FALSE.equals( rtCheckLatest ) &&
+ Boolean.valueOf( getPluginRegistry( groupId, artifactId
).getCheckLatest() )
+ .booleanValue() );
// third pass...if we're checking for latest install/deploy, retrieve
the version for LATEST metadata and also
// set that resolved version as the <useVersion/> in settings.xml.
@@ -478,7 +479,8 @@
return groupId + ":" + artifactId;
}
- private String getVersionFromPluginConfig( String groupId, String
artifactId, MavenProject project, boolean resolveAsReportPlugin )
+ private String getVersionFromPluginConfig( String groupId, String
artifactId, MavenProject project,
+ boolean resolveAsReportPlugin )
{
String version = null;
@@ -622,15 +624,16 @@
Artifact artifact = artifactFactory.createProjectArtifact( groupId,
artifactId, metaVersionId );
String version = null;
-
+
try
{
- ResolutionGroup resolutionGroup = artifactMetadataSource.retrieve(
artifact, localRepository, remoteRepositories );
-
+ ResolutionGroup resolutionGroup = artifactMetadataSource.retrieve(
artifact, localRepository,
+
remoteRepositories );
+
// switching this out with the actual resolved artifact instance,
since the MMSource re-creates the pom
// artifact.
artifact = resolutionGroup.getPomArtifact();
-
+
// make sure this artifact was actually resolved to a file in the
repo...
if ( artifact.getFile() != null )
{
@@ -640,11 +643,11 @@
boolean pluginValid = true;
// if we don't have the required Maven version, then ignore an
update
- if ( project.getPrerequesites() != null &&
project.getPrerequesites().getMaven() != null )
+ if ( project.getPrerequisites() != null &&
project.getPrerequisites().getMaven() != null )
{
DefaultArtifactVersion requiredVersion = new
DefaultArtifactVersion(
- project.getPrerequesites().getMaven() );
-
+ project.getPrerequisites().getMaven() );
+
if ( runtimeInformation.getApplicationVersion().compareTo(
requiredVersion ) < 0 )
{
getLogger().info( "Ignoring available plugin update: "
+ artifact.getVersion() +
@@ -673,7 +676,7 @@
throw new PluginVersionResolutionException( groupId, artifactId,
"Unable to determine
Maven version for comparison", e );
}
-
+
return version;
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=289355&r1=289354&r2=289355&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Thu Sep 15 18:11:42 2005
@@ -39,7 +39,7 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.Prerequesites;
+import org.apache.maven.model.Prerequisites;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
@@ -158,7 +158,7 @@
this.pluginArtifacts = Collections.unmodifiableSet(
project.pluginArtifacts );
this.reportArtifacts = Collections.unmodifiableSet(
project.reportArtifacts );
this.extensionArtifacts = Collections.unmodifiableSet(
project.extensionArtifacts );
-
+
this.remoteArtifactRepositories = Collections.unmodifiableList(
project.remoteArtifactRepositories );
this.pluginArtifactRepositories = Collections.unmodifiableList(
project.pluginArtifactRepositories );
this.collectedProjects = Collections.unmodifiableList(
project.collectedProjects );
@@ -798,9 +798,9 @@
return model.getUrl();
}
- public Prerequesites getPrerequesites()
+ public Prerequisites getPrerequisites()
{
- return model.getPrerequesites();
+ return model.getPrerequisites();
}
public void setIssueManagement( IssueManagement issueManagement )
@@ -996,7 +996,7 @@
public void setPluginArtifacts( Set pluginArtifacts )
{
this.pluginArtifacts = pluginArtifacts;
-
+
this.pluginArtifactMap = null;
}
@@ -1018,7 +1018,7 @@
public void setReportArtifacts( Set reportArtifacts )
{
this.reportArtifacts = reportArtifacts;
-
+
this.reportArtifactMap = null;
}
@@ -1040,7 +1040,7 @@
public void setExtensionArtifacts( Set extensionArtifacts )
{
this.extensionArtifacts = extensionArtifacts;
-
+
this.extensionArtifactMap = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
