Author: ogusakov
Date: Thu Feb 26 05:04:07 2009
New Revision: 748017
URL: http://svn.apache.org/viewvc?rev=748017&view=rev
Log:
got rid of project in the API layer
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/trunk/maven-repository/pom.xml
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
maven/components/trunk/pom.xml
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Feb 26 05:04:07 2009
@@ -79,6 +79,7 @@
import org.apache.maven.realm.RealmManagementException;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.VersionNotFoundException;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelMarshaller;
import org.apache.maven.shared.model.ModelProperty;
@@ -399,10 +400,11 @@
coreArtifactFilterManager.getCoreArtifactFilter(),
project );
}
- catch ( InvalidDependencyVersionException e )
+ catch ( VersionNotFoundException e )
{
+ InvalidDependencyVersionException ee = new
InvalidDependencyVersionException( e.getProjectId(), e.getDependency(),
e.getPomFile(), e.getCauseException() );
throw new InvalidPluginException( "Plugin '" + plugin + "' is
invalid: "
- + e.getMessage(), e );
+ + e.getMessage(), ee );
}
ResolutionGroup resolutionGroup;
@@ -1497,7 +1499,16 @@
if ( project.getDependencyArtifacts() == null )
{
// NOTE: Don't worry about covering this case with the
error-reporter bindings...it's already handled by the project error reporter.
- project.setDependencyArtifacts( repositorySystem.createArtifacts(
project.getDependencies(), null, null, project ) );
+ try
+ {
+ project.setDependencyArtifacts(
repositorySystem.createArtifacts( project.getDependencies(), null, null,
project ) );
+ }
+ catch ( VersionNotFoundException e )
+ {
+ InvalidDependencyVersionException ee = new
InvalidDependencyVersionException( e.getProjectId(), e.getDependency(),
e.getPomFile(), e.getCauseException() );
+
+ throw ee;
+ }
}
ArtifactFilter filter = new ScopeArtifactFilter( scope );
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Thu Feb 26 05:04:07 2009
@@ -68,6 +68,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-project-builder</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository</artifactId>
+ </dependency>
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Feb 26 05:04:07 2009
@@ -49,6 +49,7 @@
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.VersionNotFoundException;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -271,11 +272,12 @@
{
project.setDependencyArtifacts( repositorySystem.createArtifacts(
project.getDependencies(), null, null, project ) );
}
- catch ( InvalidDependencyVersionException e )
+ catch ( VersionNotFoundException e )
{
+ InvalidDependencyVersionException ee = new
InvalidDependencyVersionException( e.getProjectId(), e.getDependency(),
e.getPomFile(), e.getCauseException() );
throw new ProjectBuildingException( safeVersionlessKey(
project.getGroupId(), project.getArtifactId() ),
"Unable to build project due
to an invalid dependency version: " +
- e.getMessage(),
projectDescriptor, e );
+ e.getMessage(),
projectDescriptor, ee );
}
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Thu Feb 26 05:04:07 2009
@@ -70,6 +70,7 @@
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.repository.MavenRepositoryWrapper;
import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -1661,7 +1662,14 @@
public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory,
String inheritedScope, ArtifactFilter dependencyFilter )
throws InvalidDependencyVersionException
{
- return repositorySystem.createArtifacts( getDependencies(),
inheritedScope, dependencyFilter, this );
+ try
+ {
+ return repositorySystem.createArtifacts( getDependencies(),
inheritedScope, dependencyFilter, this );
+ }
+ catch ( VersionNotFoundException e )
+ {
+ throw new InvalidDependencyVersionException( e.getProjectId(),
e.getDependency(), e.getPomFile(), e.getCauseException() );
+ }
}
public void addProjectReference( MavenProject project )
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
Thu Feb 26 05:04:07 2009
@@ -15,6 +15,7 @@
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.repository.LegacyMavenRepositorySystem;
import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -63,9 +64,11 @@
{
artifacts = createArtifacts( model.getDependencies(),
artifact.getScope(), null, null );
}
- catch ( InvalidDependencyVersionException e )
+ catch ( VersionNotFoundException e )
{
- throw new ArtifactMetadataRetrievalException( e );
+ InvalidDependencyVersionException ee = new
InvalidDependencyVersionException(e.getProjectId(),
e.getDependency(),e.getPomFile(), e.getCauseException() );
+
+ throw new ArtifactMetadataRetrievalException( ee );
}
List artifactRepositories;
Modified: maven/components/trunk/maven-repository/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/pom.xml (original)
+++ maven/components/trunk/maven-repository/pom.xml Thu Feb 26 05:04:07 2009
@@ -52,4 +52,12 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Thu Feb 26 05:04:07 2009
@@ -56,7 +56,6 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
-//import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -307,7 +306,10 @@
{
String id = repo.getId();
String url = repo.getUrl();
-
+ /*
+ MNG-4050: Temporarily disabled this check since it is breaking the
bootstrap unit tests on commons-parent pom
+ */
+ /*
if ( id == null || id.trim().length() < 1 )
{
throw new InvalidRepositoryException( "Repository ID must not
be empty (URL is: " + url + ").", url );
@@ -317,7 +319,7 @@
{
throw new InvalidRepositoryException( "Repository URL must not
be empty (ID is: " + id + ").", id );
}
-
+ */
ArtifactRepositoryPolicy snapshots =
buildArtifactRepositoryPolicy( repo.getSnapshots() );
ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy(
repo.getReleases() );
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Thu Feb 26 05:04:07 2009
@@ -62,7 +62,7 @@
Artifact createDependencyArtifact( String groupId, String artifactId,
String version, String type, String classifier, String scope, String
inheritedScope );
Set<Artifact> createArtifacts( List<Dependency> dependencies, String
inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor
)
- throws VersionNotFoundException;
+ throws VersionNotFoundException;
// Repository creation
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
Thu Feb 26 05:04:07 2009
@@ -35,6 +35,10 @@
extends Exception
{
private Dependency dependency;
+
+ private String projectId;
+ private File pomFile;
+ private InvalidVersionSpecificationException cause;
public VersionNotFoundException( String projectId
, Dependency dependency
@@ -44,6 +48,12 @@
{
super( projectId+", "+formatLocationInPom( dependency )+ " "
+dependency.getVersion()+", pom file "+pomFile, cause );
+ this.projectId = projectId;
+
+ this.pomFile = pomFile;
+
+ this.cause = cause;
+
this.dependency = dependency;
}
@@ -56,4 +66,21 @@
{
return dependency;
}
+
+ public String getProjectId()
+ {
+ return projectId;
+ }
+
+ public File getPomFile()
+ {
+ return pomFile;
+ }
+
+ public InvalidVersionSpecificationException getCauseException()
+ {
+ return cause;
+ }
+
+
}
Modified: maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=748017&r1=748016&r2=748017&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Feb 26 05:04:07 2009
@@ -317,6 +317,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${project.version}</version>
</dependency>
