[archiva] 01/02: Removing repositoryAdmin dependency

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit 2ef9315447eee184b0b473d3364246a435dacb96
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Apr 7 20:30:27 2018 +0200

    Removing repositoryAdmin dependency
---
 .../maven/search/AbstractMavenRepositorySearch.java        | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
index de69ac5..cbf5eee 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
@@ -20,9 +20,7 @@ package org.apache.archiva.indexer.maven.search;
 */
 
 import junit.framework.TestCase;
-import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
 import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorAdmin;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
 import org.apache.archiva.common.utils.FileUtils;
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.Configuration;
@@ -45,7 +43,6 @@ import org.apache.maven.index.QueryCreator;
 import org.apache.maven.index.Scanner;
 import org.apache.maven.index.ScanningRequest;
 import org.apache.maven.index.ScanningResult;
-import org.apache.maven.index.context.IndexCreator;
 import org.apache.maven.index.context.IndexingContext;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
@@ -100,12 +97,6 @@ public abstract class AbstractMavenRepositorySearch
     Configuration config;
 
     @Inject
-    PlexusSisuBridge plexusSisuBridge;
-
-    @Inject
-    List<IndexCreator> indexCreators;
-
-    @Inject
     Indexer indexer;
 
     @Inject
@@ -131,9 +122,6 @@ public abstract class AbstractMavenRepositorySearch
 
         archivaConfig = archivaConfigControl.createMock( ArchivaConfiguration.class );
 
-        DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin = new DefaultManagedRepositoryAdmin();
-        defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfig );
-
         DefaultProxyConnectorAdmin defaultProxyConnectorAdmin = new DefaultProxyConnectorAdmin();
         defaultProxyConnectorAdmin.setArchivaConfiguration( archivaConfig );
         repositoryRegistry.setArchivaConfiguration( archivaConfig );
@@ -142,14 +130,12 @@ public abstract class AbstractMavenRepositorySearch
                                             queryCreator );
 
         assertNotNull( repositoryRegistry );
-        defaultManagedRepositoryAdmin.setRepositoryRegistry( repositoryRegistry );
 
         config = new Configuration();
         config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) );
         config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) );
         config.addManagedRepository( createRepositoryConfig( REPO_RELEASE ) );
 
-
         archivaConfig.addListener( EasyMock.anyObject( ConfigurationListener.class ) );
         EasyMock.expect( archivaConfig.getDefaultLocale() ).andReturn( Locale.getDefault( ) ).anyTimes();
         EasyMock.expect( archivaConfig.getConfiguration() ).andReturn(config).anyTimes();

-- 
To stop receiving notification emails like this one, please contact
martin_s@apache.org.