Repository: archiva Updated Branches: refs/heads/feature/jcr_oak 70a589837 -> ec6344198
indexer is not using plexus bridge anymore Signed-off-by: olivier lamy <ol...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ec634419 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ec634419 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ec634419 Branch: refs/heads/feature/jcr_oak Commit: ec634419861f580a318074f22dda47c210479251 Parents: 70a5898 Author: olivier lamy <ol...@apache.org> Authored: Sat Jun 24 08:42:26 2017 +1000 Committer: olivier lamy <ol...@apache.org> Committed: Sat Jun 24 08:42:26 2017 +1000 ---------------------------------------------------------------------- .../archiva-repository-admin-default/pom.xml | 20 ++++++++++++++-- .../managed/DefaultManagedRepositoryAdmin.java | 24 +++++++++++--------- .../main/resources/META-INF/spring-context.xml | 2 +- pom.xml | 5 ++++ 4 files changed, 37 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/ec634419/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 06fe2e4..4b164e7 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -38,6 +38,24 @@ <artifactId>archiva-security-common</artifactId> </dependency> <dependency> + <groupId>org.apache.maven.indexer</groupId> + <artifactId>indexer-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-repository-api</artifactId> </dependency> @@ -109,7 +127,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>${spring.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -120,7 +137,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${spring.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/archiva/blob/ec634419/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index f398bca..7d23575 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -109,23 +109,25 @@ public class DefaultManagedRepositoryAdmin private Cache<String, Collection<String>> namespacesCache; // fields - List<? extends IndexCreator> indexCreators; + @Inject + private List<? extends IndexCreator> indexCreators; - NexusIndexer indexer; + @Inject + private NexusIndexer indexer; @PostConstruct public void initialize() throws RepositoryAdminException, RoleManagerException { - try - { - indexCreators = mavenIndexerUtils.getAllIndexCreators(); - indexer = plexusSisuBridge.lookup( NexusIndexer.class ); - } - catch ( PlexusSisuBridgeException e ) - { - throw new RepositoryAdminException( e.getMessage(), e ); - } +// try +// { +// indexCreators = mavenIndexerUtils.getAllIndexCreators(); +// indexer = plexusSisuBridge.lookup( NexusIndexer.class ); +// } +// catch ( PlexusSisuBridgeException e ) +// { +// throw new RepositoryAdminException( e.getMessage(), e ); +// } // initialize index context on start and check roles here for ( ManagedRepository managedRepository : getManagedRepositories() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/ec634419/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml index aa4743c..04e14fb 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml @@ -29,7 +29,7 @@ <context:annotation-config /> <context:component-scan - base-package="org.apache.archiva.admin.repository"/> + base-package="org.apache.archiva.admin.repository,org.apache.maven.index"/> <alias name="redbackRuntimeConfigurationAdmin#default" alias="userConfiguration#archiva"/> http://git-wip-us.apache.org/repos/asf/archiva/blob/ec634419/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 517e655..362773e 100644 --- a/pom.xml +++ b/pom.xml @@ -323,6 +323,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-common</artifactId> + <version>3.0.1</version> + </dependency> <dependency> <groupId>org.apache.archiva</groupId>
