Deprecate com.yahoo.config.provision.Version

We have com.yahoo.component.Version, and one is enough.

2 files changed, 12 insertions, 2 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
index 0f30575d5aa..4c1798c549f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
@@ -56,10 +56,10 @@ public class AllocatedHosts {
         cursor.setString(hostSpecHostName, host.hostname());
         host.membership().ifPresent(membership -> {
             cursor.setString(hostSpecMembership, membership.stringValue());
-            cursor.setString(hostSpecVespaVersion, membership.cluster().vespaVersion().toString());
+            cursor.setString(hostSpecVespaVersion, membership.cluster().vespaVersion().toFullString());
         });
         host.flavor().ifPresent(flavor -> cursor.setString(hostSpecFlavor, flavor.name()));
-        host.version().ifPresent(version -> cursor.setString(hostSpecCurrentVespaVersion, version.toString()));
+        host.version().ifPresent(version -> cursor.setString(hostSpecCurrentVespaVersion, version.toFullString()));
     }
 
     /** Returns the hosts of this allocation */
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Version.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Version.java
index 5e40ef70d7d..bd6e7d62833 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Version.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Version.java
@@ -14,8 +14,10 @@ package com.yahoo.config.provision;
  * @since 5.39
  * Loosely based on component/Version.java
  * {@link Version} objects are immutable.
+ * @deprecated use com.yahoo.component.Version
  */
 // TODO: Replace usage of this by com.yahoo.component.Version
+@Deprecated
 public final class Version implements Comparable<Version> {
 
     private final int major;
@@ -51,6 +53,10 @@ public final class Version implements Comparable<Version> {
         }
     }
 
+    public com.yahoo.component.Version toVersion() {
+        return new com.yahoo.component.Version(major, minor, micro);
+    }
+
     /**
      * Verifies that the numerical components in a version are legal.
      * Must be called on construction after the component values are set
@@ -94,6 +100,10 @@ public final class Version implements Comparable<Version> {
         return new Version(versionString);
     }
 
+    public static Version from(com.yahoo.component.Version version) {
+        return new Version(version.getMajor(), version.getMinor(), version.getMicro());
+    }
+
     /**
      * Returns a string representation of this version identifier, encoded as major.minor.micro
      */