Author: rfscholte
Date: Sat Jul 25 09:25:50 2015
New Revision: 1692609
URL: http://svn.apache.org/r1692609
Log:
Fix licenses
Add DefaultArtifactCoordinate.toString()
ArtifactResolver.resolveDependencies() should use Dependencies, since this
Object has a scope, an ArtifactCoordinate doesn't.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
Sat Jul 25 09:25:50 2015
@@ -1,16 +1,39 @@
package org.apache.maven.shared.artifact;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Contains all elements of an Maven Artifact of Dependency to calculate its
path for either a local or remote
+ * Maven2 repository
+ *
+ * @author Robert Scholte
+ */
public interface ArtifactCoordinate
{
+ String getGroupId();
- public abstract String getGroupId();
+ String getArtifactId();
- public abstract String getArtifactId();
+ String getVersion();
- public abstract String getVersion();
-
- public abstract String getType();
-
- public abstract String getClassifier();
+ String getType();
+ String getClassifier();
}
\ No newline at end of file
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
Sat Jul 25 09:25:50 2015
@@ -147,5 +147,20 @@ public class DefaultArtifactCoordinate i
this.classifier = classifier;
}
+ @Override
+ public String toString()
+ {
+ StringBuilder sb =
+ new StringBuilder().append( groupId ).append( ':' ).append(
artifactId ).append( ':' ).append( type );
+
+ if ( classifier != null )
+ {
+ sb.append( ':' ).append( classifier );
+ }
+
+ sb.append( ':' ).append( version );
+
+ return sb.toString();
+ }
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
Sat Jul 25 09:25:50 2015
@@ -104,4 +104,32 @@ public final class TransferUtils
return coordinate;
}
+
+ public static Dependency toDependency( Artifact artifact )
+ {
+ Dependency dependency = new Dependency();
+
+ dependency.setGroupId( artifact.getGroupId() );
+ dependency.setArtifactId( artifact.getArtifactId() );
+ dependency.setVersion( artifact.getVersion() );
+ dependency.setType( artifact.getType() );
+ dependency.setClassifier( artifact.getClassifier() );
+ dependency.setScope( artifact.getScope() );
+
+ return dependency;
+ }
+
+ public static Dependency toDependency( ArtifactCoordinate coordinate )
+ {
+ Dependency dependency = new Dependency();
+
+ dependency.setGroupId( coordinate.getGroupId() );
+ dependency.setArtifactId( coordinate.getArtifactId() );
+ dependency.setVersion( coordinate.getVersion() );
+ dependency.setType( coordinate.getType() );
+ dependency.setClassifier( coordinate.getClassifier() );
+
+ return dependency;
+ }
+
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
Sat Jul 25 09:25:50 2015
@@ -22,6 +22,7 @@ package org.apache.maven.shared.artifact
import java.util.Collection;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
@@ -55,6 +56,6 @@ public interface ArtifactResolver
throws ArtifactResolverException;
Iterable<ArtifactResult> resolveDependencies( ProjectBuildingRequest
buildingRequest,
-
Collection<ArtifactCoordinate> dependencies, TransformableFilter filter )
+ Collection<Dependency>
dependencies, TransformableFilter filter )
throws ArtifactResolverException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
Sat Jul 25 09:25:50 2015
@@ -22,6 +22,7 @@ package org.apache.maven.shared.artifact
import java.util.Collection;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
@@ -83,7 +84,7 @@ public class DefaultArtifactResolver
@Override
public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest,
-
Collection<ArtifactCoordinate> coordinates,
+
Collection<Dependency> coordinates,
TransformableFilter
filter )
throws ArtifactResolverException
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
Sat Jul 25 09:25:50 2015
@@ -152,7 +152,7 @@ public class Maven30ArtifactResolver
@Override
public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
-
Collection<ArtifactCoordinate> coordinates,
+
Collection<org.apache.maven.model.Dependency>
mavenDependencies,
TransformableFilter filter )
throws ArtifactResolverException
{
@@ -160,11 +160,17 @@ public class Maven30ArtifactResolver
(ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
ArtifactHandlerManager.class, artifactHandlerManager );
- List<Dependency> dependencies = new ArrayList<Dependency>(
coordinates.size() );
+ List<Dependency> aetherDependencies = new ArrayList<Dependency>(
mavenDependencies.size() );
- for ( ArtifactCoordinate coordinate : coordinates )
+ final Class<?>[] argClasses = new Class<?>[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
+
+ for ( org.apache.maven.model.Dependency mavenDependency :
mavenDependencies )
{
- dependencies.add( toDependency( coordinate, typeRegistry ) );
+ Object[] args = new Object[] {mavenDependency, typeRegistry };
+
+ Dependency aetherDependency = (Dependency) Invoker.invoke(
RepositoryUtils.class, "toDependency", argClasses, args );
+
+ aetherDependencies.add( aetherDependency );
}
@SuppressWarnings( "unchecked" )
@@ -172,7 +178,7 @@ public class Maven30ArtifactResolver
(List<RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
"toRepos", List.class,
buildingRequest.getRemoteRepositories() );
- CollectRequest request = new CollectRequest( (Dependency) null,
dependencies, aetherRepositories );
+ CollectRequest request = new CollectRequest( (Dependency) null,
aetherDependencies, aetherRepositories );
return resolveDependencies( buildingRequest, aetherRepositories,
filter, request );
}
@@ -252,7 +258,7 @@ public class Maven30ArtifactResolver
Artifact artifact =
new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
coordinate.getVersion(), null, stereotype );
-
+
return new Dependency( artifact, null );
}
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java?rev=1692609&r1=1692608&r2=1692609&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Sat Jul 25 09:25:50 2015
@@ -154,7 +154,7 @@ public class Maven31ArtifactResolver
@Override
public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
-
Collection<ArtifactCoordinate> coordinates,
+
Collection<org.apache.maven.model.Dependency>
mavenDependencies,
TransformableFilter filter )
throws ArtifactResolverException
{
@@ -162,11 +162,17 @@ public class Maven31ArtifactResolver
(ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
ArtifactHandlerManager.class, artifactHandlerManager );
- List<Dependency> dependencies = new ArrayList<Dependency>(
coordinates.size() );
+ List<Dependency> aetherDependencies = new ArrayList<Dependency>(
mavenDependencies.size() );
- for ( ArtifactCoordinate coordinate : coordinates )
+ final Class<?>[] argClasses = new Class<?>[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
+
+ for ( org.apache.maven.model.Dependency mavenDependency :
mavenDependencies )
{
- dependencies.add( toDependency( coordinate, typeRegistry ) );
+ Object[] args = new Object[] {mavenDependency, typeRegistry };
+
+ Dependency aetherDependency = (Dependency) Invoker.invoke(
RepositoryUtils.class, "toDependency", argClasses, args );
+
+ aetherDependencies.add( aetherDependency );
}
@SuppressWarnings( "unchecked" )
@@ -174,7 +180,7 @@ public class Maven31ArtifactResolver
(List<RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
"toRepos", List.class,
buildingRequest.getRemoteRepositories() );
- CollectRequest request = new CollectRequest( (Dependency) null,
dependencies, aetherRepositories );
+ CollectRequest request = new CollectRequest( (Dependency) null,
aetherDependencies, aetherRepositories );
return resolveDependencies( buildingRequest, aetherRepositories,
filter, request );
}
