mirror of https://github.com/apache/maven.git
Upgrade dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327764 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
772bf37124
commit
34c964a21f
|
@ -10,7 +10,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-container-default</artifactId>
|
||||
<version>1.0-alpha-7-SNAPSHOT</version>
|
||||
<version>1.0-alpha-8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>plexus</groupId>
|
||||
|
@ -20,27 +20,27 @@
|
|||
<dependency>
|
||||
<groupId>plexus</groupId>
|
||||
<artifactId>plexus-mail-sender-simple</artifactId>
|
||||
<version>1.0-alpha-1</version>
|
||||
<version>1.0-alpha-2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-artifact</artifactId>
|
||||
<version>2.0-beta-1</version>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-project</artifactId>
|
||||
<version>2.0-beta-1</version>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-artifact-manager</artifactId>
|
||||
<version>2.0-beta-1</version>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-model</artifactId>
|
||||
<version>2.0-beta-1</version>
|
||||
<version>2.0</version>
|
||||
<classifier>all</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.maven.tools.repoclean.discover;
|
|||
import org.apache.maven.artifact.Artifact;
|
||||
import org.apache.maven.artifact.factory.ArtifactFactory;
|
||||
import org.apache.maven.tools.repoclean.report.PathLister;
|
||||
import org.apache.maven.tools.repoclean.report.ReportWriteException;
|
||||
import org.apache.maven.tools.repoclean.report.Reporter;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
|
@ -41,7 +42,7 @@ public class LegacyArtifactDiscoverer
|
|||
|
||||
public List discoverArtifacts( File repositoryBase, Reporter reporter, String blacklistedPatterns,
|
||||
PathLister excludeLister, PathLister kickoutLister, boolean includeSnapshots )
|
||||
throws Exception
|
||||
throws ReportWriteException
|
||||
{
|
||||
List artifacts = new ArrayList();
|
||||
|
||||
|
@ -65,7 +66,7 @@ public class LegacyArtifactDiscoverer
|
|||
}
|
||||
|
||||
private Artifact buildArtifact( String path, PathLister kickoutLister )
|
||||
throws Exception
|
||||
throws ReportWriteException
|
||||
{
|
||||
try
|
||||
{
|
||||
|
@ -288,8 +289,7 @@ public class LegacyArtifactDiscoverer
|
|||
{
|
||||
getLogger().debug( "Creating artifact with classifier." );
|
||||
|
||||
result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version,
|
||||
Artifact.SCOPE_RUNTIME, type,
|
||||
result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type,
|
||||
classifierBuffer.toString() );
|
||||
}
|
||||
else
|
||||
|
|
|
@ -20,6 +20,7 @@ import org.apache.maven.model.Build;
|
|||
import org.apache.maven.model.CiManagement;
|
||||
import org.apache.maven.model.Contributor;
|
||||
import org.apache.maven.model.Dependency;
|
||||
import org.apache.maven.model.DeploymentRepository;
|
||||
import org.apache.maven.model.Developer;
|
||||
import org.apache.maven.model.DistributionManagement;
|
||||
import org.apache.maven.model.IssueManagement;
|
||||
|
@ -31,7 +32,6 @@ import org.apache.maven.model.Organization;
|
|||
import org.apache.maven.model.Plugin;
|
||||
import org.apache.maven.model.ReportPlugin;
|
||||
import org.apache.maven.model.Reporting;
|
||||
import org.apache.maven.model.Repository;
|
||||
import org.apache.maven.model.Resource;
|
||||
import org.apache.maven.model.Scm;
|
||||
import org.apache.maven.model.Site;
|
||||
|
@ -426,13 +426,13 @@ public class PomV3ToV4Translator
|
|||
|
||||
String distributionDirectory = v3Model.getDistributionDirectory();
|
||||
|
||||
Repository repository = null;
|
||||
DeploymentRepository repository = null;
|
||||
|
||||
if ( StringUtils.isEmpty( distributionSite ) )
|
||||
{
|
||||
if ( !StringUtils.isEmpty( distributionDirectory ) )
|
||||
{
|
||||
repository = new Repository();
|
||||
repository = new DeploymentRepository();
|
||||
|
||||
repository.setId( "default" );
|
||||
|
||||
|
@ -451,7 +451,7 @@ public class PomV3ToV4Translator
|
|||
"Missing 'distributionDirectory': must be set is 'distributionSite' is set." );
|
||||
}
|
||||
|
||||
repository = new Repository();
|
||||
repository = new DeploymentRepository();
|
||||
|
||||
repository.setId( "default" );
|
||||
|
||||
|
|
Loading…
Reference in New Issue