You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/07/07 18:46:49 UTC
svn commit: r674556 - in /maven/artifact/trunk: ./
src/main/java/org/apache/maven/artifact/
src/main/java/org/apache/maven/artifact/resolver/
Author: brett
Date: Mon Jul 7 09:46:44 2008
New Revision: 674556
URL: http://svn.apache.org/viewvc?rev=674556&view=rev
Log:
[MARTIFACT-27] repair additional binary compatibility issues as reported by clirr
Modified:
maven/artifact/trunk/pom.xml
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
Modified: maven/artifact/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/pom.xml?rev=674556&r1=674555&r2=674556&view=diff
==============================================================================
--- maven/artifact/trunk/pom.xml (original)
+++ maven/artifact/trunk/pom.xml Mon Jul 7 09:46:44 2008
@@ -165,6 +165,42 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.9</version>
+ </comparisonArtifact>
+ <comparisonArtifact>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0.9</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <excludes>
+ <!-- expanding interfaces we exclude. Worth reviewing on occasion -->
+ <exclude>org/apache/maven/artifact/manager/WagonManager</exclude>
+ <exclude>org/apache/maven/artifact/metadata/ArtifactMetadataSource*</exclude>
+ <exclude>org/apache/maven/artifact/repository/ArtifactRepositoryFactory*</exclude>
+ <exclude>org/apache/maven/artifact/resolver/ArtifactCollector</exclude>
+ <exclude>org/apache/maven/artifact/transform/ArtifactTransformationManager*</exclude>
+ <exclude>org/apache/maven/artifact/resolver/ArtifactResolver*</exclude>
+ <exclude>org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt</exclude>
+ <exclude>org/apache/maven/artifact/resolver/conflict/ConflictResolver*</exclude>
+ <!-- plexus interfaces were removed only -->
+ <exclude>org/apache/maven/artifact/transform/DefaultArtifactTransformationManager</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<properties>
<wagon.version>1.0-beta-3</wagon.version>
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java?rev=674556&r1=674555&r2=674556&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java Mon Jul 7 09:46:44 2008
@@ -50,6 +50,13 @@
this.repositoryId = repositoryId;
}
+ @Deprecated
+ public InvalidRepositoryException( String message, Throwable t )
+ {
+ super( message );
+ this.repositoryId = null;
+ }
+
protected InvalidRepositoryException( String message,
String repositoryId )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java?rev=674556&r1=674555&r2=674556&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java Mon Jul 7 09:46:44 2008
@@ -58,6 +58,36 @@
remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail(), cause );
}
+ @Deprecated
+ protected ArtifactNotFoundException( String message,
+ Artifact artifact,
+ List<ArtifactRepository> remoteRepositories,
+ Throwable cause )
+ {
+ this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
+ artifact.getClassifier(),
+ remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail(), cause );
+ }
+
+ @Deprecated
+ public ArtifactNotFoundException( String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ String downloadUrl,
+ List path,
+ Throwable cause )
+ {
+ super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier,
+ downloadUrl, path ), groupId, artifactId,
+ version, type, classifier, remoteRepositories, null, cause );
+
+ this.downloadUrl = downloadUrl;
+ }
+
public ArtifactNotFoundException( String message,
String groupId,
String artifactId,
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=674556&r1=674555&r2=674556&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Mon Jul 7 09:46:44 2008
@@ -79,6 +79,12 @@
super( message, artifact, null, cause );
}
+ @Deprecated
+ public ArtifactResolutionException( String message, Artifact artifact, Throwable cause )
+ {
+ super( message, artifact, null, cause );
+ }
+
protected ArtifactResolutionException( String message,
Artifact artifact,
List<ArtifactRepository> remoteRepositories,
@@ -87,6 +93,13 @@
super( message, artifact, remoteRepositories, cause );
}
+ @Deprecated
+ protected ArtifactResolutionException( String message, Artifact artifact,
+ List<ArtifactRepository> remoteRepositories, Throwable cause )
+ {
+ super( message, artifact, remoteRepositories, cause );
+ }
+
protected ArtifactResolutionException( String message,
Artifact artifact,
List<ArtifactRepository> remoteRepositories,