Jackson
17	1.6	debug
jackson-core-asl-1.9.11.jar	226.69 kB	137	121	8	1.5	debug
Total	Size	-	-
org.codehaus.jackson:jackson-core-asl:jar:1.9.11	-	-	-
Total	apache.snapshots	Version	Type	License
org.codehaus.jackson	jackson-core-asl	1.9.11	jar	The Apache Software License, Version 2.0

Jackson
- Description: Jackson is a high-performance JSON processor (parser, generator) - URL: http://jackson.codehaus.org - Project License: The Apache Software License, Version 2.0

17	1.6	debug
jackson-core-asl-1.9.11.jar	226.69 kB	137	121	8	1.5	debug
Total	Size	-	-
org.codehaus.jackson:jackson-core-asl:jar:1.9.11	-	-	-
Total	apache.snapshots	Version	Type	License
org.codehaus.jackson	jackson-core-asl	1.9.11	jar	The Apache Software License, Version 2.0

Jackson
- Description: Jackson is a high-performance JSON processor (parser, generator) - URL: http://jackson.codehaus.org - Project License: The Apache Software License, Version 2.0

@@ -435,14 +421,6 @@

Dependency File Details

- - - - - - - - @@ -568,11 +546,6 @@

Dependency Repository Locations-

- - - - - diff --git a/google-api-client-assembly/readme.html b/google-api-client-assembly/readme.html index 4fc8a8b88..43822f309 100644 --- a/google-api-client-assembly/readme.html +++ b/google-api-client-assembly/readme.html @@ -123,12 +123,6 @@

Dependencies for all Platforms

jackson-core-${project.jackson-core2.version}.jar

google-http-client-jackson-${project.http.version}.jar (when using - Jackson 1) -

jackson-core-asl-${project.jackson-core-asl.version}.jar

google-api-client-xml-${project.version}.jar (when using XML)

google-http-client-xml-${project.version}.jar

1.30.4

3.0.2

2.8.5

1.9.13

2.9.8

3.10.0

28.0-android

Date: Tue, 12 Nov 2019 12:20:36 -0500 Subject: [PATCH 07/21] deps: update guava to 28.1-android (#1410) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07d94be97..bdeb9ca27 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ 2.8.5

2.9.8

3.10.0 - 28.0-android + 28.1-android 1.9.77 1.1.4c 4.5.9 From a65e99a89ce903c7dee5c93fc6d5912370844c11 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Nov 2019 18:22:30 -0500 Subject: [PATCH 08/21] chore: fix warnings (#1412) --- .../services/AbstractGoogleClientRequestTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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..439b6ad27 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 @@ -18,7 +18,6 @@ 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; @@ -290,9 +289,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); } }; } From a6c6decbd4a162ff4030e2c3f74c72eb6ac9eddb Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 13 Nov 2019 18:07:12 -0600 Subject: [PATCH 09/21] fix: grab version from package metadata (#1419) * fix: detect version from packaging * test: add test ensuring version constants are present * chore: only run checkstyle on Java 8+ --- google-api-client/pom.xml | 21 ++++++ .../api/client/googleapis/GoogleUtils.java | 26 +++++-- .../googleapis/google-api-client.properties | 1 + .../client/googleapis/GoogleUtilsTest.java | 8 +++ pom.xml | 72 ++++++++++++++----- 5 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 254e33959..daf918cfe 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -18,6 +18,17 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + + resources + + + + maven-javadoc-plugin @@ -94,6 +105,16 @@ + + + + src/main/resources + + + src/main/properties + true + + 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/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/pom.xml b/pom.xml index bdeb9ca27..53f6246e1 100644 --- a/pom.xml +++ b/pom.xml @@ -297,8 +297,9 @@ + org.apache.maven.plugins maven-checkstyle-plugin - 2.6 + 3.1.0 org.codehaus.mojo @@ -325,6 +326,11 @@ maven-site-plugin 3.8.2 + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + @@ -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 @@ -546,5 +536,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 + + + + + + + From d6f117bf64beeafd8aaf0fc90171445e105dcb79 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 14 Nov 2019 12:28:17 -0600 Subject: [PATCH 10/21] chore: fix distribution_name in .repo-metadata (#1422) --- .repo-metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.repo-metadata.json b/.repo-metadata.json index a43864403..fe101bec7 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -6,5 +6,5 @@ "language": "java", "repo": "googleapis/google-api-java-client", "repo_short": "google-api-java-client", - "distribution_name": "google-api-java-client" + "distribution_name": "com.google.api-client:google-api-client" } From 580c9f8a6b8dd6fe1cdb30cd4617de8d766435a9 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 Nov 2019 10:09:04 -0800 Subject: [PATCH 11/21] chore: regenerate common templates (#1423) --- .github/release-please.yml | 1 + .kokoro/build.sh | 5 +++-- .kokoro/dependencies.sh | 6 +++++- synth.metadata | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 827446828..dce2c8450 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f410..aa6d4f647 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -57,4 +58,4 @@ clirr) ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index e7faa9b61..58e0c4f6b 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/synth.metadata b/synth.metadata index 73971feb8..ab544f2fb 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-26T07:50:56.303029Z", + "updateTime": "2019-11-19T08:38:56.588037Z", "sources": [ { "template": { From 57d7efe5432757491db0eabe447522c693bfea43 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 20 Nov 2019 09:26:30 -0800 Subject: [PATCH 12/21] chore: update common templates (#1424) --- .kokoro/build.sh | 9 +++++++-- synth.metadata | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index aa6d4f647..dc2936ef7 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -50,11 +50,16 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; diff --git a/synth.metadata b/synth.metadata index ab544f2fb..4259b4413 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-11-19T08:38:56.588037Z", + "updateTime": "2019-11-19T19:37:23.751501Z", "sources": [ { "template": { From bfb4d9cacdadd8065be07b1bf0c22ea7aeb94d97 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 21 Nov 2019 15:02:37 -0600 Subject: [PATCH 13/21] fix: user-agent should use identifier/version (#1425) * fix: user-agent should use identifier/version * test: inline USER_AGENT_SUFFIX in test --- .../googleapis/services/AbstractGoogleClientRequest.java | 5 +++-- .../services/AbstractGoogleClientRequestTest.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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/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 439b6ad27..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,6 +12,7 @@ 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; @@ -203,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( @@ -215,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(); From 4100d2d4e8dea4d6578c103dfec11278a63bfc30 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 22 Nov 2019 22:59:58 +0100 Subject: [PATCH 14/21] chore(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.0.0-m3 (#1429) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53f6246e1..2138609a2 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 enforce-maven From c4be24d2f371c22aa12d47085e88f21774efa6e5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Dec 2019 22:59:31 +0100 Subject: [PATCH 15/21] deps: update dependency com.google.protobuf:protobuf-java to v3.11.0 (#1431) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2138609a2..e5ac936a5 100644 --- a/pom.xml +++ b/pom.xml @@ -488,7 +488,7 @@ 3.0.2 2.8.5 2.9.8 - 3.10.0 + 3.11.0 28.1-android 1.9.77 1.1.4c From 6d5a27da989b9de5d87d9dcb22c2ec00168e63c4 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 2 Dec 2019 16:46:55 -0600 Subject: [PATCH 16/21] chore: fix link to documentation guide (#1433) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2b33d5af..974caac60 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The library has the following features: ## Usage -For detailed instructions on usage, please visit the [wiki](https://github.com/googleapis/google-api-java-client/wiki). +For detailed instructions on usage, please visit the [guide](https://googleapis.github.io/google-api-java-client/). ## Installation From d15bbcd857ad05f21ba7524b2828916ea1b58e06 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 3 Dec 2019 11:57:29 -0500 Subject: [PATCH 17/21] chore: remove jackson2 variable we don't use (#1437) --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5ac936a5..33e7b3cce 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,6 @@ 1.30.4 3.0.2 2.8.5 - 2.9.8

3.11.0

28.1-android 1.9.77 From c1eaa851d9bd4102a0cff21d972190923050fd5e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 3 Dec 2019 18:50:50 +0100 Subject: [PATCH 18/21] deps: update dependency com.google.protobuf:protobuf-java to v3.11.1 (#1436) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33e7b3cce..098b6d10a 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ 1.30.4 3.0.2 2.8.5 - 3.11.0 + 3.11.1 28.1-android 1.9.77 1.1.4c From fd5c50938096eb855a5559b569f7c0b0c8124e14 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 3 Dec 2019 14:01:47 -0500 Subject: [PATCH 19/21] chore: fix project name in doc site (#1439) fixes #1438 --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 0c830d027..be445c594 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,2 +1,2 @@ theme: jekyll-theme-dinky -title: Google HTTP Client for Java +title: Google APIs Client Library for Java From 21af62a45eb167adcf4d6932b27f9e2b86fc06f3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 3 Dec 2019 17:41:30 -0600 Subject: [PATCH 20/21] docs: fix link to media upload documentation (#1442) --- .../google/api/client/googleapis/media/MediaHttpUploader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 35e058f40e315b05954acdb043bd6176e9fb9701 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 14:54:46 -0800 Subject: [PATCH 21/21] chore: release 1.30.6 (#1435) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java [ci skip] * updated versions.txt [ci skip] * updated google-api-client-android/pom.xml [ci skip] * updated google-api-client-appengine/pom.xml [ci skip] * updated google-api-client-assembly/pom.xml [ci skip] * updated google-api-client-bom/pom.xml [ci skip] * updated google-api-client-gson/pom.xml [ci skip] * updated google-api-client-jackson2/pom.xml [ci skip] * updated google-api-client-java6/pom.xml [ci skip] * updated google-api-client-protobuf/pom.xml [ci skip] * updated google-api-client-servlet/pom.xml [ci skip] * updated google-api-client-xml/pom.xml [ci skip] * updated google-api-client/pom.xml [ci skip] * updated pom.xml [ci skip] --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 4 ++-- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 15 files changed, 46 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b486aa3e5..7d24220a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +### [1.30.6](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.5...v1.30.6) (2019-12-03) + + +### Bug Fixes + +* grab version from package metadata ([#1419](https://www.github.com/googleapis/google-api-java-client/issues/1419)) ([a6c6dec](https://www.github.com/googleapis/google-api-java-client/commit/a6c6decbd4a162ff4030e2c3f74c72eb6ac9eddb)) +* user-agent should use identifier/version ([#1425](https://www.github.com/googleapis/google-api-java-client/issues/1425)) ([bfb4d9c](https://www.github.com/googleapis/google-api-java-client/commit/bfb4d9cacdadd8065be07b1bf0c22ea7aeb94d97)) + + +### Documentation + +* fix link to media upload documentation ([#1442](https://www.github.com/googleapis/google-api-java-client/issues/1442)) ([21af62a](https://www.github.com/googleapis/google-api-java-client/commit/21af62a45eb167adcf4d6932b27f9e2b86fc06f3)) + + +### Dependencies + +* remove jackson-core-asl ([#1414](https://www.github.com/googleapis/google-api-java-client/issues/1414)) ([8e08249](https://www.github.com/googleapis/google-api-java-client/commit/8e082496d41ed271523b78df80e678a338f22a8a)) +* update dependency com.google.protobuf:protobuf-java to v3.11.0 ([#1431](https://www.github.com/googleapis/google-api-java-client/issues/1431)) ([c4be24d](https://www.github.com/googleapis/google-api-java-client/commit/c4be24d2f371c22aa12d47085e88f21774efa6e5)) +* update dependency com.google.protobuf:protobuf-java to v3.11.1 ([#1436](https://www.github.com/googleapis/google-api-java-client/issues/1436)) ([c1eaa85](https://www.github.com/googleapis/google-api-java-client/commit/c1eaa851d9bd4102a0cff21d972190923050fd5e)) +* update guava to 28.1-android ([#1410](https://www.github.com/googleapis/google-api-java-client/issues/1410)) ([1d37f32](https://www.github.com/googleapis/google-api-java-client/commit/1d37f325d3c0cf808cd7c006ba9414e4dd65e5b6)) + ### [1.30.5](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.4...v1.30.5) (2019-10-24) diff --git a/README.md b/README.md index 974caac60..6739b0507 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To use Maven, add the following lines to your pom.xml file: com.google.api-client google-api-client - 1.30.5 + 1.30.6 @@ -47,7 +47,7 @@ repositories { mavenCentral() } dependencies { - compile 'com.google.api-client:google-api-client:1.30.5' + compile 'com.google.api-client:google-api-client:1.30.6' } ``` [//]: # ({x-version-update-end}) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 4a92e073c..7e2e778c0 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 83172e1b8..67c83b954 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 63405d6cd..b7d5db97f 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index e4b200f3a..a948e419f 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 1.30.6-SNAPSHOT + 1.30.6 pom Google API Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.api-client google-api-client - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-android - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-appengine - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-assembly - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-gson - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-jackson2 - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-java6 - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-protobuf - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-servlet - 1.30.6-SNAPSHOT + 1.30.6 com.google.api-client google-api-client-xml - 1.30.6-SNAPSHOT + 1.30.6 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 48da875d6..74dfd30a5 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 9b6bb05b7..85d7b12dd 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 7b0aacf76..4dc93c32d 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index b998c91e4..64bbff8d2 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index fe6522db3..7cf042316 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 7df513f0e..22dce0bbb 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index daf918cfe..b9e8e4edc 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 098b6d10a..b74f4d760 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.api-client google-api-client-parent - 1.30.6-SNAPSHOT + 1.30.6 pom Parent for the Google API Client Library for Java diff --git a/versions.txt b/versions.txt index a961b45a6..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.6-SNAPSHOT +google-api-client:1.30.6:1.30.6

Total	apache.snapshots
17	1.6	debug
jackson-core-asl-1.9.11.jar	226.69 kB	137	121	8	1.5	debug
Total	Size	-	-
org.codehaus.jackson:jackson-core-asl:jar:1.9.11	-	-	-

compile

test

Dependency Tree

Dependency File Details

Dependency Repository Locations-

test

provided

Dependency Tree

Dependency File Details

Dependency Repository Locations-

test

provided

Dependency Tree

Dependency File Details

Dependency Repository Locations-

Dependencies for all Platforms