From 8335c602150386736a55dd0313f6b3c1f8292316 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Wed, 8 May 2019 19:38:23 +0200 Subject: [PATCH] Moving filter API to common module --- .../src/main/java/org/apache/archiva}/filter/AllFilter.java | 2 +- .../java/org/apache/archiva}/filter/ExcludesFilter.java | 2 +- .../src/main/java/org/apache/archiva}/filter/Filter.java | 2 +- .../java/org/apache/archiva}/filter/IncludesFilter.java | 2 +- .../repository/storage/maven2/Maven2RepositoryStorage.java | 2 +- ...aven2RepositoryMetadataResolverMRM1411RepoGroupTest.java | 4 ++-- .../maven2/Maven2RepositoryMetadataResolverMRM1411Test.java | 4 ++-- .../Maven2RepositoryMetadataResolverManagedReleaseTest.java | 4 ++-- ...Maven2RepositoryMetadataResolverManagedSnapshotTest.java | 4 ++-- .../maven2/Maven2RepositoryMetadataResolverTest.java | 6 +++--- .../rest/services/DefaultMergeRepositoriesService.java | 6 ++---- .../org/apache/archiva/security/mock/MockBeanServices.java | 2 +- .../metadata/repository/DefaultMetadataResolver.java | 2 +- .../metadata/repository/storage/ReadMetadataRequest.java | 2 +- .../metadata/repository/storage/RepositoryStorage.java | 2 +- .../repository/cassandra/MockRepositoryStorage.java | 2 +- .../stagerepository/merge/Maven2RepositoryMerger.java | 2 +- .../archiva/stagerepository/merge/RepositoryMerger.java | 2 +- 18 files changed, 25 insertions(+), 27 deletions(-) rename archiva-modules/{metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository => archiva-base/archiva-common/src/main/java/org/apache/archiva}/filter/AllFilter.java (94%) rename archiva-modules/{metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository => archiva-base/archiva-common/src/main/java/org/apache/archiva}/filter/ExcludesFilter.java (95%) rename archiva-modules/{metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository => archiva-base/archiva-common/src/main/java/org/apache/archiva}/filter/Filter.java (94%) rename archiva-modules/{metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository => archiva-base/archiva-common/src/main/java/org/apache/archiva}/filter/IncludesFilter.java (95%) diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/AllFilter.java similarity index 94% rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java rename to archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/AllFilter.java index 1759a19be..289472704 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/AllFilter.java @@ -1,4 +1,4 @@ -package org.apache.archiva.metadata.repository.filter; +package org.apache.archiva.filter; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/ExcludesFilter.java similarity index 95% rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java rename to archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/ExcludesFilter.java index ab872e0c8..ff24d7d54 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/ExcludesFilter.java @@ -1,4 +1,4 @@ -package org.apache.archiva.metadata.repository.filter; +package org.apache.archiva.filter; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/Filter.java similarity index 94% rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java rename to archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/Filter.java index 88344e8b3..689586f84 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/Filter.java @@ -1,4 +1,4 @@ -package org.apache.archiva.metadata.repository.filter; +package org.apache.archiva.filter; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/IncludesFilter.java similarity index 95% rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java rename to archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/IncludesFilter.java index 4969a64e0..841e48fd7 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/filter/IncludesFilter.java @@ -1,4 +1,4 @@ -package org.apache.archiva.metadata.repository.filter; +package org.apache.archiva.filter; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index b7011ca1a..e754a72cf 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -28,7 +28,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RelocationException; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java index c10f13dc4..2cb7fe4eb 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java @@ -31,8 +31,8 @@ import org.apache.archiva.metadata.model.Dependency; import org.apache.archiva.metadata.model.License; import org.apache.archiva.metadata.model.MailingList; import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.repository.filter.AllFilter; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.AllFilter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.proxy.maven.WagonFactory; import org.apache.archiva.proxy.maven.WagonFactoryRequest; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java index e094a20ad..65213b78c 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java @@ -30,8 +30,8 @@ import org.apache.archiva.metadata.model.Dependency; import org.apache.archiva.metadata.model.License; import org.apache.archiva.metadata.model.MailingList; import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.repository.filter.AllFilter; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.AllFilter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; import org.apache.archiva.proxy.maven.WagonFactory; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java index a5dc3491c..27e4b07bb 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java @@ -20,8 +20,8 @@ package org.apache.archiva.metadata.repository.storage.maven2; */ import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.repository.filter.AllFilter; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.AllFilter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; import org.apache.archiva.proxy.maven.WagonFactory; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java index 03a67cdea..8b04dbe0b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java @@ -20,8 +20,8 @@ package org.apache.archiva.metadata.repository.storage.maven2; */ import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.repository.filter.AllFilter; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.AllFilter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; import org.apache.archiva.repository.RepositoryRegistry; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 9f1b4c523..47d65557e 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -32,9 +32,9 @@ import org.apache.archiva.metadata.model.License; import org.apache.archiva.metadata.model.MailingList; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; -import org.apache.archiva.metadata.repository.filter.AllFilter; -import org.apache.archiva.metadata.repository.filter.ExcludesFilter; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.AllFilter; +import org.apache.archiva.filter.ExcludesFilter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java index 256d73a11..0f95ae133 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java @@ -18,8 +18,6 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.metadata.model.ArtifactMetadata; @@ -27,8 +25,8 @@ import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.filter.Filter; -import org.apache.archiva.metadata.repository.filter.IncludesFilter; +import org.apache.archiva.filter.Filter; +import org.apache.archiva.filter.IncludesFilter; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.MergeRepositoriesService; diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java index 728f675a5..5d61568e8 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java @@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorage; import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataException; diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java index d12a29fc8..b3f6f43b8 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java @@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.ProjectVersionReference; -import org.apache.archiva.metadata.repository.filter.ExcludesFilter; +import org.apache.archiva.filter.ExcludesFilter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RepositoryStorage; import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java index 56e9f02d2..09ff8cbad 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ReadMetadataRequest.java @@ -18,7 +18,7 @@ package org.apache.archiva.metadata.repository.storage; * under the License. */ -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; /** * @author Olivier Lamy diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java index c9895da81..cb2051011 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java @@ -22,7 +22,7 @@ package org.apache.archiva.metadata.repository.storage; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.policies.ProxyDownloadException; import org.apache.archiva.repository.ManagedRepositoryContent; diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java index cd844d420..2cd68f41b 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; import org.apache.archiva.metadata.repository.storage.RelocationException; import org.apache.archiva.metadata.repository.storage.RepositoryStorage; 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 b0cf465a2..049f3a719 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 @@ -28,7 +28,7 @@ import org.apache.archiva.maven2.metadata.MavenMetadataReader; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.repository.RepositoryException; diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java index 2d124f392..9ad3ee662 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java @@ -21,7 +21,7 @@ package org.apache.archiva.stagerepository.merge; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; -import org.apache.archiva.metadata.repository.filter.Filter; +import org.apache.archiva.filter.Filter; import java.util.List; -- 2.39.5