diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java index 9bb2fc74c..b4eca557f 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java @@ -89,22 +89,20 @@ public static synchronized KeyStore getCertificateTrustStore() } private static String getVersion() { - String version = GoogleUtils.class.getPackage().getImplementationVersion(); - // in a non-packaged environment (local), there's no implementation version to read - if (version == null) { - // fall back to reading from a properties file - note this value is expected to be cached - try (InputStream inputStream = - GoogleUtils.class.getResourceAsStream("google-api-client.properties")) { - if (inputStream != null) { - Properties properties = new Properties(); - properties.load(inputStream); - version = properties.getProperty("google-api-client.version"); - } - } catch (IOException e) { - // ignore + // attempt to read the library's version from a properties file generated during the build + // this value should be read and cached for later use + String version = null; + try (InputStream inputStream = + GoogleUtils.class.getResourceAsStream("google-api-client.properties")) { + if (inputStream != null) { + Properties properties = new Properties(); + properties.load(inputStream); + version = properties.getProperty("google-api-client.version"); } + } catch (IOException e) { + // ignore } - return version; + return version == null ? "unknown-version" : version; } private GoogleUtils() {}