Revert "Add zone info to query profile context"

3 files changed, 0 insertions, 24 deletions

diff --git a/container-core/pom.xml b/container-core/pom.xml
index 910781f4e7d..7e4198bad0d 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -240,12 +240,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>hosted-zone-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 3ae28c2816d..99637e08b77 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -142,7 +142,6 @@ public class HandlersConfigurerTestWrapper {
                 // Needed by e.g. SearchHandler
                 bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON);
                 bind(Embedder.class).to(Embedder.FailingEmbedder.class).in(Scopes.SINGLETON);
-                bind(ai.vespa.cloud.ZoneInfo.class).to(MockZoneInfo.class);
                 bind(ContainerThreadPool.class).to(SimpleContainerThreadpool.class);
                 bind(Metric.class).to(MockMetric.class);
             }
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java
deleted file mode 100644
index 11c14f8e581..00000000000
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.core.config.testutil;
-
-import ai.vespa.cloud.ZoneInfo;
-
-/**
- * A ZoneInfo subclass which can be created (for injection) with an emopty constructor
- *
- * @author bratseth
- */
-public class MockZoneInfo extends ZoneInfo {
-
-    public MockZoneInfo() {
-        super(ZoneInfo.defaultInfo().application(), ZoneInfo.defaultInfo().zone());
-    }
-
-}