diff options
| author | Brett Porter <brett@apache.org> | 2008-11-28 16:29:00 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2008-11-28 16:29:00 +0000 |
| commit | 6f2d5bad731ccbe5c8d01e67d58c016a08970014 (patch) | |
| tree | 3e58789c6daec977f11c0f60d42c0e2d437262df /archiva-modules/archiva-base | |
| parent | 630281a13bfc4fa2b769c101a23829ffb4541487 (diff) | |
| download | archiva-6f2d5bad731ccbe5c8d01e67d58c016a08970014.tar.gz archiva-6f2d5bad731ccbe5c8d01e67d58c016a08970014.zip | |
[MRM-1025] consolidate dependency graphing classes into one module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@721529 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-dependency-graph/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java (renamed from archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java) | 6 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-repository-layer/pom.xml | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 9e629bd28..a03cebe34 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -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> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java index cc47e1aa6..c08b6c4f1 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java +++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/ProjectModelBasedGraphBuilder.java @@ -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 @@ package org.apache.maven.archiva.repository.project.dependencies; * 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; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 15411bd4c..de93e0429 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -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> |