diff options
4 files changed, 1 insertions, 8 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index dd8bb7f78e2..bbb287352fc 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -14,7 +14,6 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.DeploymentInstanceSpec; import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.application.api.UnparsedConfigDefinition; -import com.yahoo.config.application.api.xml.DeploymentSpecXmlReader; import com.yahoo.config.codegen.DefParser; import com.yahoo.config.model.application.AbstractApplicationPackage; import com.yahoo.config.provision.ApplicationId; diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java index b6a183c06ab..afaab0f4890 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java @@ -8,9 +8,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Zone; import com.yahoo.io.reader.NamedReader; import com.yahoo.path.Path; -import com.yahoo.text.XML; import com.yahoo.vespa.config.ConfigDefinitionKey; -import org.w3c.dom.Element; import java.io.File; import java.io.IOException; @@ -72,9 +70,6 @@ public interface ApplicationPackage { String RULES_NAME_SUFFIX = ".sr"; String EXT_DIR = "ext"; - // TODO: Remove when oldest model version is 8.95 - String PERMANENT_SERVICES = "permanent-services.xml"; - ApplicationId getApplicationId(); /** diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index dede5092b45..d5a1b832aba 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -38,7 +38,6 @@ public interface ModelContext { ApplicationPackage applicationPackage(); Optional<Model> previousModel(); - default Optional<ApplicationPackage> permanentApplicationPackage() { return Optional.empty(); } // TODO: Remove when oldest model version is 8.95 HostProvisioner getHostProvisioner(); Provisioned provisioned(); DeployLogger deployLogger(); diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java index c19ebc5dcd4..f99c0e32a36 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -161,7 +161,7 @@ public class PermanentFlags { HOSTNAME, NODE_TYPE, TENANT_ID, APPLICATION_ID, CLUSTER_TYPE, CLUSTER_ID, VESPA_VERSION); public static final UnboundStringFlag ZOOKEEPER_SERVER_VERSION = defineStringFlag( - "zookeeper-server-version", "3.8.0", // Note: Nodes running Vespa 7 have 3.7.1 as the only available version + "zookeeper-server-version", "3.8.0", "ZooKeeper server version, a jar file zookeeper-server-<ZOOKEEPER_SERVER_VERSION>-jar-with-dependencies.jar must exist", "Takes effect on restart of Docker container", NODE_TYPE, APPLICATION_ID, HOSTNAME); |