Version info from property file (#802)

* get version from txt file

* also get it from versioninfo if fails

* version from property file

* comment

* comments

Author: l-trotta

build.gradle.kts

@@ -19,9 +19,7 @@
 
 allprojects {
     group = "co.elastic.clients"
-    // Release manager provides a $VERSION. If not present, it's a local or CI snapshot build.
-    version = System.getenv("VERSION") ?:
-        (File(project.rootDir, "config/version.txt").readText().trim() + "-SNAPSHOT")
+    version = (File(project.rootDir, "config/version.txt").readText().trim() + "-SNAPSHOT")
 
     repositories {
         maven {

java-client-serverless/build.gradle.kts

@@ -37,8 +37,7 @@ checkstyle {
     toolVersion = "10.16.0"
 }
 
-// GitHub Maven repo doesn't like 1.0.0+20231031-SNAPSHOT
-version = "1.0.0-20231031-SNAPSHOT"
+version = (File(project.rootDir, "config/version-serverless.txt").readText().trim() + "-SNAPSHOT")
 
 signing {
     sign(publishing.publications)

java-client-serverless/src/main/resources/co/elastic/clients/version.properties

@@ -0,0 +1,21 @@
+#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version=${version}
+git_revision=${git_revision}

java-client/src/main/java/co/elastic/clients/transport/Version.java

@@ -19,8 +19,12 @@
 
 package co.elastic.clients.transport;
 
+import co.elastic.clients.ApiClient;
+
 import javax.annotation.Nullable;
+import java.io.InputStream;
 import java.util.Objects;
+import java.util.Properties;
 
 /**
  * This class represents a SemVer version, with an optional patch revision.
@@ -45,20 +49,20 @@ public static Version parse(String version) {
         int hyphen = version.indexOf('-');
         if (hyphen >= 0) {
             // Has prerelease. May be followed buy build information
-            prerelease = version.substring(hyphen+1);
+            prerelease = version.substring(hyphen + 1);
             version = version.substring(0, hyphen);
 
             int plus = prerelease.indexOf('+');
             if (plus >= 0) {
-                build = prerelease.substring(0, plus+1);
+                build = prerelease.substring(0, plus + 1);
                 prerelease = prerelease.substring(0, plus);
             }
         }
 
         int plus = version.indexOf('+');
         if (plus >= 0) {
             // Has build information
-            build = version.substring(0, plus+1);
+            build = version.substring(0, plus + 1);
             version = version.substring(0, plus);
         }
 
@@ -68,8 +72,7 @@ public static Version parse(String version) {
             int minor = (bits.length >= 2) ? Integer.parseInt(bits[1]) : 0;
             int maintenance = (bits.length >= 3) ? Integer.parseInt(bits[2]) : -1;
             return new Version(major, minor, maintenance, prerelease, build);
-        }
-        catch(NumberFormatException ex) {
+        } catch (NumberFormatException ex) {
             return null;
         }
     }
@@ -78,7 +81,8 @@ public Version(int major, int minor, int maintenance, boolean isPreRelease) {
         this(major, minor, maintenance, isPreRelease ? "p" : null, null);
     }
 
-    public Version(int major, int minor, int maintenance, @Nullable String prerelease, @Nullable String build) {
+    public Version(int major, int minor, int maintenance, @Nullable String prerelease,
+                   @Nullable String build) {
         this.major = major;
         this.minor = minor;
         this.maintenance = maintenance;
@@ -108,10 +112,10 @@ public boolean equals(Object other) {
         if (!(other instanceof Version)) return false;
         Version that = (Version) other;
         return (major == that.major &&
-                minor == that.minor &&
-                maintenance == that.maintenance &&
-                Objects.equals(prerelease, that.prerelease) &&
-                Objects.equals(build, that.build));
+            minor == that.minor &&
+            maintenance == that.maintenance &&
+            Objects.equals(prerelease, that.prerelease) &&
+            Objects.equals(build, that.build));
     }
 
     @Override
@@ -146,10 +150,19 @@ public String toString() {
 
     static {
         Version version = null;
-        try {
-            version = Version.parse(VersionInfo.VERSION);
-        } catch (Exception e) {
-            // Failed to parse version
+        InputStream in = ApiClient.class.getResourceAsStream("version.properties");
+        if (in != null) {
+            Properties properties = new Properties();
+            try {
+                properties.load(in);
+                String versionStr = properties.getProperty("version");
+                if (versionStr != null) {
+                    version = Version.parse(versionStr);
+                }
+            } catch (Exception e) {
+                // Failed to parse version from file, trying from VersionInfo
+                version = Version.parse(VersionInfo.VERSION);
+            }
         }
         VERSION = version;
     }