You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/12/26 16:52:02 UTC
svn commit: r1721736 - in
/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared:
artifact/collect/ dependency/collect/ dependency/collect/internal/
Author: rfscholte
Date: Sat Dec 26 15:52:02 2015
New Revision: 1721736
URL: http://svn.apache.org/viewvc?rev=1721736&view=rev
Log:
Change package for DependencyCollectors
Added:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/CollectorResult.java
- copied, changed from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollector.java
- copied, changed from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollectorException.java
- copied, changed from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/
- copied from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/
Removed:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/DefaultDependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Invoker.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30ArtifactRepositoryAdapter.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30DependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31ArtifactRepositoryAdapter.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31DependencyCollector.java
Copied: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/CollectorResult.java (from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/CollectorResult.java?p2=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/CollectorResult.java&p1=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java&r1=1721612&r2=1721736&rev=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/CollectorResult.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect;
+package org.apache.maven.shared.dependency.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollector.java (from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollector.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollector.java?p2=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollector.java&p1=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollector.java&r1=1721612&r2=1721736&rev=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollector.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollector.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect;
+package org.apache.maven.shared.dependency.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollectorException.java (from r1721612, maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollectorException.java?p2=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollectorException.java&p1=maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java&r1=1721612&r2=1721736&rev=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/DependencyCollectorException.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect;
+package org.apache.maven.shared.dependency.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/DefaultDependencyCollector.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/DefaultDependencyCollector.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/DefaultDependencyCollector.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/DefaultDependencyCollector.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,9 @@ package org.apache.maven.shared.artifact
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.collect.CollectorResult;
-import org.apache.maven.shared.artifact.collect.DependencyCollector;
-import org.apache.maven.shared.artifact.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependency.collect.CollectorResult;
+import org.apache.maven.shared.dependency.collect.DependencyCollector;
+import org.apache.maven.shared.dependency.collect.DependencyCollectorException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Invoker.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Invoker.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Invoker.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Invoker.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.artifact
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.artifact.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependency.collect.DependencyCollectorException;
/**
* Invokes method on objects using reflection.
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30ArtifactRepositoryAdapter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30ArtifactRepositoryAdapter.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30ArtifactRepositoryAdapter.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30ArtifactRepositoryAdapter.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30CollectorResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30CollectorResult.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30CollectorResult.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30CollectorResult.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.shared.artifact.collect.CollectorResult;
+import org.apache.maven.shared.dependency.collect.CollectorResult;
import org.sonatype.aether.collection.CollectResult;
import org.sonatype.aether.graph.DependencyNode;
import org.sonatype.aether.graph.DependencyVisitor;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30DependencyCollector.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30DependencyCollector.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30DependencyCollector.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven30DependencyCollector.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.collect.CollectorResult;
-import org.apache.maven.shared.artifact.collect.DependencyCollector;
-import org.apache.maven.shared.artifact.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependency.collect.CollectorResult;
+import org.apache.maven.shared.dependency.collect.DependencyCollector;
+import org.apache.maven.shared.dependency.collect.DependencyCollectorException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31ArtifactRepositoryAdapter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31ArtifactRepositoryAdapter.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31ArtifactRepositoryAdapter.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31ArtifactRepositoryAdapter.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31CollectorResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31CollectorResult.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31CollectorResult.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31CollectorResult.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.shared.artifact.collect.CollectorResult;
+import org.apache.maven.shared.dependency.collect.CollectorResult;
import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.graph.DependencyVisitor;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31DependencyCollector.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31DependencyCollector.java?rev=1721736&r1=1721612&r2=1721736&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31DependencyCollector.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependency/collect/internal/Maven31DependencyCollector.java Sat Dec 26 15:52:02 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.collect.internal;
+package org.apache.maven.shared.dependency.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.collect.CollectorResult;
-import org.apache.maven.shared.artifact.collect.DependencyCollector;
-import org.apache.maven.shared.artifact.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependency.collect.CollectorResult;
+import org.apache.maven.shared.dependency.collect.DependencyCollector;
+import org.apache.maven.shared.dependency.collect.DependencyCollectorException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;