Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Carlos Sanchez Gonzalez 2005-10-23 08:23:20 +00:00
parent 772bf37124
commit 34c964a21f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sandbox/repoclean/pom.xml
View File

@ -10,7 +10,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-7-SNAPSHOT</version> <version>1.0-alpha-8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>plexus</groupId>
@ -20,27 +20,27 @@
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>plexus</groupId>
<artifactId>plexus-mail-sender-simple</artifactId> <artifactId>plexus-mail-sender-simple</artifactId>
<version>1.0-alpha-1</version> <version>1.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version> <version>2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-beta-1</version> <version>2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId> <artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version> <version>2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-beta-1</version> <version>2.0</version>
<classifier>all</classifier> <classifier>all</classifier>
</dependency> </dependency>
<dependency> <dependency>

8
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java
View File

@ -19,6 +19,7 @@ package org.apache.maven.tools.repoclean.discover;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.tools.repoclean.report.PathLister; 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.apache.maven.tools.repoclean.report.Reporter;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
@ -41,7 +42,7 @@ public class LegacyArtifactDiscoverer
public List discoverArtifacts( File repositoryBase, Reporter reporter, String blacklistedPatterns, public List discoverArtifacts( File repositoryBase, Reporter reporter, String blacklistedPatterns,
PathLister excludeLister, PathLister kickoutLister, boolean includeSnapshots ) PathLister excludeLister, PathLister kickoutLister, boolean includeSnapshots )
throws Exception throws ReportWriteException
{ {
List artifacts = new ArrayList(); List artifacts = new ArrayList();
@ -65,7 +66,7 @@ public class LegacyArtifactDiscoverer
} }
private Artifact buildArtifact( String path, PathLister kickoutLister ) private Artifact buildArtifact( String path, PathLister kickoutLister )
throws Exception throws ReportWriteException
{ {
try try
{ {
@ -288,8 +289,7 @@ public class LegacyArtifactDiscoverer
{ {
getLogger().debug( "Creating artifact with classifier." ); getLogger().debug( "Creating artifact with classifier." );
result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type,
Artifact.SCOPE_RUNTIME, type,
classifierBuffer.toString() ); classifierBuffer.toString() );
} }
else else

8
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
View File

@ -20,6 +20,7 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.CiManagement; import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Contributor; import org.apache.maven.model.Contributor;
import org.apache.maven.model.Dependency; import org.apache.maven.model.Dependency;
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Developer; import org.apache.maven.model.Developer;
import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.IssueManagement; 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.Plugin;
import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting; import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource; import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm; import org.apache.maven.model.Scm;
import org.apache.maven.model.Site; import org.apache.maven.model.Site;
@ -426,13 +426,13 @@ public class PomV3ToV4Translator
String distributionDirectory = v3Model.getDistributionDirectory(); String distributionDirectory = v3Model.getDistributionDirectory();
Repository repository = null; DeploymentRepository repository = null;
if ( StringUtils.isEmpty( distributionSite ) ) if ( StringUtils.isEmpty( distributionSite ) )
{ {
if ( !StringUtils.isEmpty( distributionDirectory ) ) if ( !StringUtils.isEmpty( distributionDirectory ) )
{ {
repository = new Repository(); repository = new DeploymentRepository();
repository.setId( "default" ); repository.setId( "default" );
@ -451,7 +451,7 @@ public class PomV3ToV4Translator
"Missing 'distributionDirectory': must be set is 'distributionSite' is set." ); "Missing 'distributionDirectory': must be set is 'distributionSite' is set." );
} }
repository = new Repository(); repository = new DeploymentRepository();
repository.setId( "default" ); repository.setId( "default" );