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 a89617a89..9bb2fc74c 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
@@ -16,11 +16,11 @@
import com.google.api.client.util.SecurityUtils;
import com.google.common.annotations.VisibleForTesting;
-
import java.io.IOException;
import java.io.InputStream;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
+import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,11 +32,8 @@
*/
public final class GoogleUtils {
- // NOTE: toString() so compiler thinks it isn't a constant, so it won't inline it
- // {x-version-update-start:google-api-client:current}
/** Current release version. */
- public static final String VERSION = "1.30.3".toString();
- // {x-version-update-end:google-api-client:current}
+ public static final String VERSION = getVersion();
// NOTE: Integer instead of int so compiler thinks it isn't a constant, so it won't inline it
/**
@@ -91,5 +88,24 @@ public static synchronized KeyStore getCertificateTrustStore()
return certTrustStore;
}
+ 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
+ }
+ }
+ return version;
+ }
+
private GoogleUtils() {}
}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
index e4e294085..379ca70d7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
@@ -44,7 +44,7 @@
/**
* Media HTTP Uploader, with support for both direct and resumable media uploads. Documentation is
- * available here.
+ * available here.
*
*
* For resumable uploads, when the media content length is known, if the provided
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
index f5cbd8f77..9622addf1 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
@@ -126,9 +126,10 @@ protected AbstractGoogleClientRequest(AbstractGoogleClient abstractGoogleClient,
// application name
String applicationName = abstractGoogleClient.getApplicationName();
if (applicationName != null) {
- requestHeaders.setUserAgent(applicationName + " " + USER_AGENT_SUFFIX);
+ requestHeaders.setUserAgent(applicationName + " " + USER_AGENT_SUFFIX + "/"
+ + GoogleUtils.VERSION);
} else {
- requestHeaders.setUserAgent(USER_AGENT_SUFFIX);
+ requestHeaders.setUserAgent(USER_AGENT_SUFFIX + "/" + GoogleUtils.VERSION);
}
// Set the header for the Api Client version (Java and OS version)
requestHeaders.set(API_VERSION_HEADER, ApiClientVersion.DEFAULT_VERSION);
diff --git a/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties b/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties
new file mode 100644
index 000000000..f6a515d62
--- /dev/null
+++ b/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties
@@ -0,0 +1 @@
+google-api-client.version=${project.version}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
index a25e20209..aa961382c 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
@@ -56,4 +56,12 @@ public void testVersionMatcherSnapshot() {
assertEquals(30, Integer.parseInt(matcher.group(2)));
assertEquals(3, Integer.parseInt(matcher.group(3)));
}
+
+ public void testVersion() {
+ Matcher matcher = GoogleUtils.VERSION_PATTERN.matcher(GoogleUtils.VERSION);
+ assertTrue(matcher.find());
+ assertNotNull(GoogleUtils.MAJOR_VERSION);
+ assertNotNull(GoogleUtils.MINOR_VERSION);
+ assertNotNull(GoogleUtils.BUGFIX_VERSION);
+ }
}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
index 3eb4353f4..398ceb93a 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
@@ -12,13 +12,13 @@
package com.google.api.client.googleapis.services;
+import com.google.api.client.googleapis.GoogleUtils;
import com.google.api.client.googleapis.services.AbstractGoogleClientRequest.ApiClientVersion;
import com.google.api.client.googleapis.testing.services.MockGoogleClient;
import com.google.api.client.googleapis.testing.services.MockGoogleClientRequest;
import com.google.api.client.http.EmptyContent;
import com.google.api.client.http.HttpMethods;
import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpResponseException;
import com.google.api.client.http.HttpStatusCodes;
import com.google.api.client.http.HttpTransport;
@@ -204,7 +204,7 @@ public void testUserAgentSuffix() throws Exception {
// Specify an Application Name.
String applicationName = "Test Application";
transport.expectedUserAgent = applicationName + " "
- + AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " "
+ + "Google-API-Java-Client/" + GoogleUtils.VERSION + " "
+ HttpRequest.USER_AGENT_SUFFIX;
MockGoogleClient client = new MockGoogleClient.Builder(
transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
@@ -216,7 +216,8 @@ public void testUserAgentSuffix() throws Exception {
public void testUserAgent() throws IOException {
AssertUserAgentTransport transport = new AssertUserAgentTransport();
- transport.expectedUserAgent = AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " " + HttpRequest.USER_AGENT_SUFFIX;
+ transport.expectedUserAgent = "Google-API-Java-Client/" + GoogleUtils.VERSION + " "
+ + HttpRequest.USER_AGENT_SUFFIX;
// Don't specify an Application Name.
MockGoogleClient client = new MockGoogleClient.Builder(
transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).build();
@@ -290,9 +291,12 @@ public LowLevelHttpRequest buildRequest(final String method, final String url) {
return new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpResponse execute() {
- return new MockLowLevelHttpResponse().setContentEncoding("gzip").setContent(new ByteArrayInputStream(
- BaseEncoding.base64()
- .decode("H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA=")));
+ byte[] data = BaseEncoding.base64().decode(
+ "H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA=");
+ ByteArrayInputStream content = new ByteArrayInputStream(data);
+ return new MockLowLevelHttpResponse()
+ .setContentEncoding("gzip")
+ .setContent(content);
}
};
}
diff --git a/pom.xml b/pom.xml
index 4b7582fa8..b74f4d760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
com.google.api-client
google-api-client-parent
- 1.30.5
+ 1.30.6
pom
Parent for the Google API Client Library for Java
@@ -253,7 +253,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.1.0
+ 3.2.0
attach-sources
@@ -279,7 +279,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.1.2
+ 3.2.0
@@ -297,8 +297,9 @@
+ org.apache.maven.plugins
maven-checkstyle-plugin
- 2.6
+ 3.1.0
org.codehaus.mojo
@@ -325,13 +326,18 @@
maven-site-plugin
3.8.2
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.1.0
+
org.apache.maven.plugins
maven-enforcer-plugin
- 3.0.0-M2
+ 3.0.0-M3
enforce-maven
@@ -412,22 +418,6 @@
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- checkstyle.xml
- true
- ${basedir}/../checkstyle-suppressions.xml
-
-
-
-
- check
-
-
-
-
org.codehaus.mojo
findbugs-maven-plugin
@@ -497,11 +487,9 @@
1.30.4
3.0.2
2.8.5
- 1.9.13
- 2.9.8
- 3.10.0
- 28.0-android
- 1.9.65
+ 3.11.1
+ 28.1-android
+ 1.9.77
1.1.4c
4.5.9
4.4.11
@@ -547,5 +535,53 @@
+
+
+
+ root-directory
+
+
+ checkstyle-suppressions.xml
+
+
+
+ .
+
+
+
+
+
+ checkstyle-tests
+
+ [1.8,)
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+
+ com.puppycrawl.tools
+ checkstyle
+ 8.23
+
+
+
+ checkstyle.xml
+ true
+ checkstyle-suppressions.xml
+
+
+
+
+ check
+
+
+
+
+
+
+
diff --git a/synth.metadata b/synth.metadata
index 4ce7899c2..4259b4413 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
{
- "updateTime": "2019-10-19T07:50:20.310494Z",
+ "updateTime": "2019-11-19T19:37:23.751501Z",
"sources": [
{
"template": {
diff --git a/versions.txt b/versions.txt
index 42c13b531..19eebaf55 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-api-client:1.30.5:1.30.5
+google-api-client:1.30.6:1.30.6
+