diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-05-08 19:38:23 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-05-08 19:38:23 +0200 |
| commit | 8335c602150386736a55dd0313f6b3c1f8292316 (patch) | |
| tree | 3996c0664733a4f39170e7cb54e26da920186058 /archiva-modules/archiva-web/archiva-rest | |
| parent | a13bfb5a01af459e734d2f5b4b36d227a8a03a91 (diff) | |
| download | archiva-8335c602150386736a55dd0313f6b3c1f8292316.tar.gz archiva-8335c602150386736a55dd0313f6b3c1f8292316.zip | |
Moving filter API to common module
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java | 6 |
1 files changed, 2 insertions, 4 deletions
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; |