You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2005/10/23 10:23:25 UTC
svn commit: r327764 - in /maven/components/trunk/sandbox/repoclean: pom.xml
src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java
src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
Author: carlos
Date: Sun Oct 23 01:23:20 2005
New Revision: 327764
URL: http://svn.apache.org/viewcvs?rev=327764&view=rev
Log:
Upgrade dependencies
Modified:
maven/components/trunk/sandbox/repoclean/pom.xml
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
Modified: maven/components/trunk/sandbox/repoclean/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/pom.xml?rev=327764&r1=327763&r2=327764&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/pom.xml (original)
+++ maven/components/trunk/sandbox/repoclean/pom.xml Sun Oct 23 01:23:20 2005
@@ -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>
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java?rev=327764&r1=327763&r2=327764&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java Sun Oct 23 01:23:20 2005
@@ -19,6 +19,7 @@
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 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 @@
}
private Artifact buildArtifact( String path, PathLister kickoutLister )
- throws Exception
+ throws ReportWriteException
{
try
{
@@ -288,8 +289,7 @@
{
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
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java?rev=327764&r1=327763&r2=327764&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java Sun Oct 23 01:23:20 2005
@@ -20,6 +20,7 @@
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.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 @@
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 @@
"Missing 'distributionDirectory': must be set is 'distributionSite' is set." );
}
- repository = new Repository();
+ repository = new DeploymentRepository();
repository.setId( "default" );