aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/plugins
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-09-16 09:06:08 +0000
committerOlivier Lamy <olamy@apache.org>2011-09-16 09:06:08 +0000
commit353936a74f15cbbf8099ea4ac022d80ca741a2f0 (patch)
treea761b0e07b704ec5659c9374e42656c20351c5cd /archiva-modules/plugins
parent752b52c521e1c4f25361b9eca09d9d28669939ac (diff)
downloadarchiva-353936a74f15cbbf8099ea4ac022d80ca741a2f0.tar.gz
archiva-353936a74f15cbbf8099ea4ac022d80ca741a2f0.zip
[MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-model module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171458 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins')
-rw-r--r--archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index 6a29d1a92..359d7d36f 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -30,7 +30,7 @@ import org.apache.archiva.common.utils.VersionUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.RepositoryMetadataReader;