You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/11/28 17:29:01 UTC
svn commit: r721529 - in /archiva/trunk/archiva-modules/archiva-base: archiva-dependency-graph/ archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ archiva-repository-layer/ archiva-repository-layer/src/main/java/org/apach...

Author: brett
Date: Fri Nov 28 08:29:00 2008
New Revision: 721529

URL: http://svn.apache.org/viewvc?rev=721529&view=rev
Log:
[MRM-1025] consolidate dependency graphing classes into one module

Added:
    archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java   (contents, props changed)
      - copied, changed from r721469, archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java
Removed:
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java
Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml?rev=721529&r1=721528&r2=721529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml Fri Nov 28 08:29:00 2008
@@ -41,6 +41,10 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-repository-layer</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Copied: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java (from r721469, archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java&r1=721469&r2=721529&rev=721529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java Fri Nov 28 08:29:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.project.dependencies;
+package org.apache.maven.archiva.dependency.graph;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.archiva.dependency.graph.DependencyGraph;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphBuilder;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphNode;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphUtils;
 import org.apache.maven.archiva.model.ArchivaProjectModel;
 import org.apache.maven.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.model.VersionedReference;

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=721529&r1=721528&r2=721529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Fri Nov 28 08:29:00 2008
@@ -42,10 +42,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-dependency-graph</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-checksum</artifactId>
     </dependency>
     <dependency>