You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/17 01:07:42 UTC
svn commit: r816002 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/repository/
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/
maven-compat/src/main/java/org/apache/maven/artifact/resolver/ mav...
Author: bentmann
Date: Wed Sep 16 23:07:41 2009
New Revision: 816002
URL: http://svn.apache.org/viewvc?rev=816002&view=rev
Log:
[MNG-4361] [regression] command line option "-update-snapshots" does not work
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java Wed Sep 16 23:07:41 2009
@@ -33,6 +33,8 @@
private boolean offline;
+ private boolean forceUpdate;
+
private ArtifactRepository localRepository;
private List<ArtifactRepository> remoteRepositories;
@@ -58,6 +60,7 @@
setRemoteRepositories( repositoryRequest.getRemoteRepositories() );
setOffline( repositoryRequest.isOffline() );
setCache( repositoryRequest.getCache() );
+ setForceUpdate( repositoryRequest.isForceUpdate() );
}
public boolean isOffline()
@@ -72,6 +75,18 @@
return this;
}
+ public boolean isForceUpdate()
+ {
+ return forceUpdate;
+ }
+
+ public DefaultRepositoryRequest setForceUpdate( boolean forceUpdate )
+ {
+ this.forceUpdate = forceUpdate;
+
+ return this;
+ }
+
public ArtifactRepository getLocalRepository()
{
return localRepository;
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java Wed Sep 16 23:07:41 2009
@@ -45,6 +45,24 @@
RepositoryRequest setOffline( boolean offline );
/**
+ * Indicates whether remote repositories should be re-checked for updated artifacts/metadata regardless of their
+ * configured update policy.
+ *
+ * @return {@code true} if remote repositories should be re-checked for updated artifacts/metadata, {@code false}
+ * otherwise.
+ */
+ boolean isForceUpdate();
+
+ /**
+ * Enables/disabled forced checks for updated artifacts/metadata on remote repositories.
+ *
+ * @param forceUpdate {@code true} to forcibly check the remote repositories for updated artifacts/metadata, {@code
+ * false} to use the update policy configured on each repository.
+ * @return This request, never {@code null}.
+ */
+ RepositoryRequest setForceUpdate( boolean forceUpdate );
+
+ /**
* Gets the local repository to use.
*
* @return The local repository to use or {@code null} if not set.
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Wed Sep 16 23:07:41 2009
@@ -117,7 +117,8 @@
new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( metadata,
repository ) );
- if ( updateCheckManager.isUpdateRequired( metadata, repository, file ) )
+ if ( ( policy.isEnabled() && request.isForceUpdate() )
+ || updateCheckManager.isUpdateRequired( metadata, repository, file ) )
{
getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
try
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java Wed Sep 16 23:07:41 2009
@@ -72,6 +72,8 @@
private boolean offline;
+ private boolean forceUpdate;
+
public ArtifactResolutionRequest()
{
// nothing here
@@ -83,6 +85,7 @@
setRemoteRepositories( request.getRemoteRepositories() );
setCache( request.getCache() );
setOffline( request.isOffline() );
+ setForceUpdate( request.isForceUpdate() );
}
public Artifact getArtifact()
@@ -272,4 +275,16 @@
return this;
}
+ public boolean isForceUpdate()
+ {
+ return forceUpdate;
+ }
+
+ public ArtifactResolutionRequest setForceUpdate( boolean forceUpdate )
+ {
+ this.forceUpdate = forceUpdate;
+
+ return this;
+ }
+
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java Wed Sep 16 23:07:41 2009
@@ -124,4 +124,16 @@
return this;
}
+ public boolean isForceUpdate()
+ {
+ return repositoryRequest.isForceUpdate();
+ }
+
+ public DefaultMetadataResolutionRequest setForceUpdate( boolean forceUpdate )
+ {
+ repositoryRequest.setForceUpdate( forceUpdate );
+
+ return this;
+ }
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java Wed Sep 16 23:07:41 2009
@@ -133,6 +133,7 @@
.setResolutionFilter( resolutionScopeFilter )
.setLocalRepository( session.getLocalRepository() )
.setOffline( session.isOffline() )
+ .setForceUpdate( session.getRequest().isUpdateSnapshots() )
.setCache( session.getRepositoryCache() );
// FIXME setTransferListener
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java Wed Sep 16 23:07:41 2009
@@ -164,4 +164,16 @@
return this;
}
+ public boolean isForceUpdate()
+ {
+ return repositoryRequest.isForceUpdate();
+ }
+
+ public DefaultPluginPrefixRequest setForceUpdate( boolean forceUpdate )
+ {
+ repositoryRequest.setForceUpdate( forceUpdate );
+
+ return this;
+ }
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java Wed Sep 16 23:07:41 2009
@@ -131,4 +131,16 @@
return this;
}
+ public boolean isForceUpdate()
+ {
+ return repositoryRequest.isForceUpdate();
+ }
+
+ public DefaultPluginVersionRequest setForceUpdate( boolean forceUpdate )
+ {
+ repositoryRequest.setForceUpdate( forceUpdate );
+
+ return this;
+ }
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Sep 16 23:07:41 2009
@@ -133,6 +133,7 @@
.setLocalRepository( configuration.getLocalRepository() )
.setRemoteRepositories( project.getRemoteArtifactRepositories() )
.setOffline( configuration.isOffline() )
+ .setForceUpdate( configuration.isForceUpdate() )
.setManagedVersionMap( project.getManagedVersionMap() );
// FIXME setTransferListener
@@ -195,7 +196,8 @@
.setCache( configuration.getRepositoryCache() )
.setLocalRepository( configuration.getLocalRepository() )
.setRemoteRepositories( configuration.getRemoteRepositories() )
- .setOffline( configuration.isOffline() );
+ .setOffline( configuration.isOffline() )
+ .setForceUpdate( configuration.isForceUpdate() );
// FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java Wed Sep 16 23:07:41 2009
@@ -39,6 +39,8 @@
private boolean offline;
+ private boolean forceUpdate;
+
private RepositoryCache repositoryCache;
private ArtifactRepository localRepository;
@@ -112,6 +114,18 @@
return offline;
}
+ public boolean isForceUpdate()
+ {
+ return forceUpdate;
+ }
+
+ public ProjectBuildingRequest setForceUpdate( boolean forceUpdate )
+ {
+ this.forceUpdate = forceUpdate;
+
+ return this;
+ }
+
public ProjectBuildingRequest setRepositoryCache( RepositoryCache repositoryCache )
{
this.repositoryCache = repositoryCache;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Wed Sep 16 23:07:41 2009
@@ -38,6 +38,10 @@
boolean isOffline();
+ ProjectBuildingRequest setForceUpdate( boolean forceUpdate );
+
+ boolean isForceUpdate();
+
ProjectBuildingRequest setRepositoryCache( RepositoryCache repositoryCache );
RepositoryCache getRepositoryCache();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=816002&r1=816001&r2=816002&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Sep 16 23:07:41 2009
@@ -525,6 +525,7 @@
configuration.setLocalRepository( repositoryRequest.getLocalRepository() );
configuration.setRemoteRepositories( repositoryRequest.getRemoteRepositories() );
configuration.setOffline( repositoryRequest.isOffline() );
+ configuration.setForceUpdate( repositoryRequest.isForceUpdate() );
configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
configuration.setProcessPlugins( false );
configuration.setSystemProperties( System.getProperties() );