From be5c208bc697db8bdc3c3549cc3f07e8d8f0cd47 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 27 Apr 2022 18:36:06 +0200 Subject: GC deprecated statistics module --- container-core/pom.xml | 15 --------------- .../yahoo/container/core/config/HandlersConfigurerDi.java | 3 --- 2 files changed, 18 deletions(-) (limited to 'container-core') diff --git a/container-core/pom.xml b/container-core/pom.xml index 4b47cfde122..294f6c0a585 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -102,21 +102,6 @@ security-utils ${project.version} - - com.yahoo.vespa - statistics - ${project.version} - - - log4j - log4j - - - com.yahoo.vespa - config - - - com.yahoo.vespa vdslib diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index decb0513e26..8aee2d43187 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -20,7 +20,6 @@ import com.yahoo.jdisc.service.ClientProvider; import com.yahoo.jdisc.service.ServerProvider; import com.yahoo.osgi.OsgiImpl; import com.yahoo.osgi.OsgiWrapper; -import com.yahoo.statistics.Statistics; import org.osgi.framework.Bundle; import java.util.ArrayList; @@ -118,7 +117,6 @@ public class HandlersConfigurerDi { return result.oldComponentsCleanupTask(); } - @SuppressWarnings("deprecation") private Injector createFallbackInjector(com.yahoo.container.Container vespaContainer, Injector discInjector) { return discInjector.createChildInjector(new AbstractModule() { @Override @@ -126,7 +124,6 @@ public class HandlersConfigurerDi { // Provide a singleton instance for all component fallbacks, // otherwise fallback injection may lead to a cascade of components requiring reconstruction. bind(com.yahoo.container.Container.class).toInstance(vespaContainer); - bind(com.yahoo.statistics.Statistics.class).toInstance(Statistics.nullImplementation); bind(AccessLog.class).toInstance(AccessLog.NONE_INSTANCE); bind(Executor.class).toInstance(fallbackExecutor); if (vespaContainer.getFileAcquirer() != null) -- cgit v1.2.3