From c3b1050171aeb36b41f716e026844cc1c11fe10d Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Thu, 30 May 2024 11:33:12 -0700 Subject: [PATCH] Remove strict version dependency to compile minimum compatible version Signed-off-by: Daniel Widdis --- .../main/java/org/opensearch/ml/common/agent/MLAgent.java | 2 +- .../ml/common/dataset/TextDocsInputDataSet.java | 2 +- .../org/opensearch/ml/common/model/MLDeploySetting.java | 2 +- .../transport/connector/MLCreateConnectorInput.java | 2 +- .../common/transport/register/MLRegisterModelInput.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/org/opensearch/ml/common/agent/MLAgent.java b/common/src/main/java/org/opensearch/ml/common/agent/MLAgent.java index f068863b1d..0e2ae4be5a 100644 --- a/common/src/main/java/org/opensearch/ml/common/agent/MLAgent.java +++ b/common/src/main/java/org/opensearch/ml/common/agent/MLAgent.java @@ -47,7 +47,7 @@ public class MLAgent implements ToXContentObject, Writeable { public static final String APP_TYPE_FIELD = "app_type"; public static final String IS_HIDDEN_FIELD = "is_hidden"; - private static final Version MINIMAL_SUPPORTED_VERSION_FOR_HIDDEN_AGENT = Version.V_2_13_0; + private static final Version MINIMAL_SUPPORTED_VERSION_FOR_HIDDEN_AGENT = Version.fromId(2130099); private String name; private String type; diff --git a/common/src/main/java/org/opensearch/ml/common/dataset/TextDocsInputDataSet.java b/common/src/main/java/org/opensearch/ml/common/dataset/TextDocsInputDataSet.java index 37b58b84ff..d6e832cd26 100644 --- a/common/src/main/java/org/opensearch/ml/common/dataset/TextDocsInputDataSet.java +++ b/common/src/main/java/org/opensearch/ml/common/dataset/TextDocsInputDataSet.java @@ -29,7 +29,7 @@ public class TextDocsInputDataSet extends MLInputDataset{ private List docs; - private static final Version MINIMAL_SUPPORTED_VERSION_FOR_MULTI_MODAL = Version.V_2_11_0; + private static final Version MINIMAL_SUPPORTED_VERSION_FOR_MULTI_MODAL = Version.fromId(2110099); @Builder(toBuilder = true) public TextDocsInputDataSet(List docs, ModelResultFilter resultFilter) { diff --git a/common/src/main/java/org/opensearch/ml/common/model/MLDeploySetting.java b/common/src/main/java/org/opensearch/ml/common/model/MLDeploySetting.java index 4bd864b237..ebf5e45572 100644 --- a/common/src/main/java/org/opensearch/ml/common/model/MLDeploySetting.java +++ b/common/src/main/java/org/opensearch/ml/common/model/MLDeploySetting.java @@ -27,7 +27,7 @@ public class MLDeploySetting implements ToXContentObject, Writeable { public static final String IS_AUTO_DEPLOY_ENABLED_FIELD = "is_auto_deploy_enabled"; public static final String MODEL_TTL_MINUTES_FIELD = "model_ttl_minutes"; private static final long DEFAULT_TTL_MINUTES = -1; - public static final Version MINIMAL_SUPPORTED_VERSION_FOR_MODEL_TTL = Version.V_2_14_0; + public static final Version MINIMAL_SUPPORTED_VERSION_FOR_MODEL_TTL = Version.fromId(2140099); private Boolean isAutoDeployEnabled; private Long modelTTLInMinutes; // in minutes diff --git a/common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java b/common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java index cf09ec9970..60a064da7f 100644 --- a/common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java +++ b/common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java @@ -48,7 +48,7 @@ public class MLCreateConnectorInput implements ToXContentObject, Writeable { public static final String ACCESS_MODE_FIELD = "access_mode"; public static final String DRY_RUN_FIELD = "dry_run"; - private static final Version MINIMAL_SUPPORTED_VERSION_FOR_CLIENT_CONFIG = Version.V_2_13_0; + private static final Version MINIMAL_SUPPORTED_VERSION_FOR_CLIENT_CONFIG = Version.fromId(2130099); public static final String DRY_RUN_CONNECTOR_NAME = "dryRunConnector"; diff --git a/common/src/main/java/org/opensearch/ml/common/transport/register/MLRegisterModelInput.java b/common/src/main/java/org/opensearch/ml/common/transport/register/MLRegisterModelInput.java index 5ced1572e2..5b27330285 100644 --- a/common/src/main/java/org/opensearch/ml/common/transport/register/MLRegisterModelInput.java +++ b/common/src/main/java/org/opensearch/ml/common/transport/register/MLRegisterModelInput.java @@ -69,10 +69,10 @@ public class MLRegisterModelInput implements ToXContentObject, Writeable { public static final String DOES_VERSION_CREATE_MODEL_GROUP = "does_version_create_model_group"; public static final String GUARDRAILS_FIELD = "guardrails"; - public static final Version MINIMAL_SUPPORTED_VERSION_FOR_DOES_VERSION_CREATE_MODEL_GROUP = Version.V_2_11_0; - public static final Version MINIMAL_SUPPORTED_VERSION_FOR_AGENT_FRAMEWORK = Version.V_2_12_0; - public static final Version MINIMAL_SUPPORTED_VERSION_FOR_GUARDRAILS_AND_AUTO_DEPLOY = Version.V_2_13_0; - public static final Version MINIMAL_SUPPORTED_VERSION_FOR_INTERFACE = Version.V_2_14_0; + public static final Version MINIMAL_SUPPORTED_VERSION_FOR_DOES_VERSION_CREATE_MODEL_GROUP = Version.fromId(2110099); + public static final Version MINIMAL_SUPPORTED_VERSION_FOR_AGENT_FRAMEWORK = Version.fromId(2120099); + public static final Version MINIMAL_SUPPORTED_VERSION_FOR_GUARDRAILS_AND_AUTO_DEPLOY = Version.fromId(2130099); + public static final Version MINIMAL_SUPPORTED_VERSION_FOR_INTERFACE = Version.fromId(2140099); private FunctionName functionName; private String modelName;