diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f60d77493..a79f06271 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 -# created: 2022-04-06T16:30:03.627422514Z + digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 +# created: 2022-05-19T15:12:45.278246753Z diff --git a/.github/release-please.yml b/.github/release-please.yml index f526582ab..918b136f6 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -10,3 +10,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.32.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 1.34.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 008ab887f..8ba866728 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -45,6 +45,20 @@ branchProtectionRules: - lint - clirr - cla/google + - pattern: 1.34.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - lint + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 7b7fb24f5..f50e638d9 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -74,6 +74,11 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg new file mode 100644 index 000000000..a3f7fb9d4 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e62a043c..d216c39c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## [1.35.0](https://github.com/googleapis/google-api-java-client/compare/v1.34.0...v1.35.0) (2022-06-02) + + +### Features + +* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/google-api-java-client/issues/1440)) ([#2075](https://github.com/googleapis/google-api-java-client/issues/2075)) ([2b1558d](https://github.com/googleapis/google-api-java-client/commit/2b1558d07d1f79939def761911d1fbdb6fb31257)) +* next release from main branch is 1.35.0 ([#2042](https://github.com/googleapis/google-api-java-client/issues/2042)) ([9005d5c](https://github.com/googleapis/google-api-java-client/commit/9005d5ca7df256342d0b6b94dfa92efc57ddeffa)) + + +### Bug Fixes + +* **deps:** update dependency com.google.api-client:google-api-client to v1.34.0 ([#2038](https://github.com/googleapis/google-api-java-client/issues/2038)) ([afea56f](https://github.com/googleapis/google-api-java-client/commit/afea56f5891e0e6e90369c04f99d64d2648edde6)) +* **deps:** update dependency com.google.api-client:google-api-client to v1.34.1 ([#2058](https://github.com/googleapis/google-api-java-client/issues/2058)) ([d1ddb69](https://github.com/googleapis/google-api-java-client/commit/d1ddb695b3ce4abc40f6af78845074f3d9e03e73)) +* **deps:** update dependency com.google.api-client:google-api-client-android to v1.34.1 ([#2059](https://github.com/googleapis/google-api-java-client/issues/2059)) ([54a9a0c](https://github.com/googleapis/google-api-java-client/commit/54a9a0c169a6a996f0ec6cfa338866e0ba3e5b57)) +* **deps:** update dependency com.google.api-client:google-api-client-appengine to v1.34.1 ([#2061](https://github.com/googleapis/google-api-java-client/issues/2061)) ([872ad59](https://github.com/googleapis/google-api-java-client/commit/872ad59ae77540bbcf27dc6966a722b68fd67a5c)) +* **deps:** update dependency com.google.api-client:google-api-client-assembly to v1.34.1 ([#2062](https://github.com/googleapis/google-api-java-client/issues/2062)) ([1a1d1b3](https://github.com/googleapis/google-api-java-client/commit/1a1d1b39f8f97bd1f9028c95a509e2205f9ecf53)) +* **deps:** update dependency com.google.api-client:google-api-client-gson to v1.34.1 ([#2064](https://github.com/googleapis/google-api-java-client/issues/2064)) ([3d1a03a](https://github.com/googleapis/google-api-java-client/commit/3d1a03a4702c09d1a880276900fcd02a9f933277)) +* **deps:** update dependency com.google.api-client:google-api-client-jackson2 to v1.34.1 ([#2065](https://github.com/googleapis/google-api-java-client/issues/2065)) ([3502186](https://github.com/googleapis/google-api-java-client/commit/350218698e07044c903e77ee2a326d21b48278ba)) +* **deps:** update dependency com.google.api-client:google-api-client-java6 to v1.34.1 ([#2066](https://github.com/googleapis/google-api-java-client/issues/2066)) ([705e865](https://github.com/googleapis/google-api-java-client/commit/705e865f05cae7e623eaba24c563512dc2cc05bc)) +* **deps:** update dependency com.google.api-client:google-api-client-protobuf to v1.34.1 ([#2068](https://github.com/googleapis/google-api-java-client/issues/2068)) ([ecedb5b](https://github.com/googleapis/google-api-java-client/commit/ecedb5b336d84a84b79d131848d438f9a31d36d0)) +* **deps:** update dependency com.google.api-client:google-api-client-servlet to v1.34.1 ([#2070](https://github.com/googleapis/google-api-java-client/issues/2070)) ([15540fe](https://github.com/googleapis/google-api-java-client/commit/15540fe7905fa19ab5e9ee104e97f7cad76e518a)) +* **deps:** update dependency com.google.api-client:google-api-client-xml to v1.34.1 ([#2071](https://github.com/googleapis/google-api-java-client/issues/2071)) ([050a269](https://github.com/googleapis/google-api-java-client/commit/050a2691a90dc5960c929661d3c31951d893e9ab)) +* **deps:** update dependency com.google.appengine:appengine-api-1.0-sdk to v2.0.5 ([#2072](https://github.com/googleapis/google-api-java-client/issues/2072)) ([526e103](https://github.com/googleapis/google-api-java-client/commit/526e1037fb370a9bae7fa9670ec62b72792b060d)) +* **deps:** update dependency com.google.cloud:libraries-bom to v25.2.0 ([#2050](https://github.com/googleapis/google-api-java-client/issues/2050)) ([6c48f89](https://github.com/googleapis/google-api-java-client/commit/6c48f8954ed6ac161512e01defa358e7c7ea0627)) +* **deps:** update dependency com.google.cloud:libraries-bom to v25.3.0 ([#2073](https://github.com/googleapis/google-api-java-client/issues/2073)) ([11dc2bb](https://github.com/googleapis/google-api-java-client/commit/11dc2bb17c8875989c80edb6b42a39b8fd87278d)) +* **deps:** update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.3 ([#2041](https://github.com/googleapis/google-api-java-client/issues/2041)) ([be65181](https://github.com/googleapis/google-api-java-client/commit/be65181a67c87bdd1c7bcea3c99d25b4256fde4b)) +* **deps:** update dependency com.google.oauth-client:google-oauth-client-bom to v1.34.0 ([#2081](https://github.com/googleapis/google-api-java-client/issues/2081)) ([8684064](https://github.com/googleapis/google-api-java-client/commit/86840649d97a4236740c5d3f07dfb8034324c03a)) +* use verifyPayload instead of verify to disable duplicate signature check ([#2080](https://github.com/googleapis/google-api-java-client/issues/2080)) ([003ca44](https://github.com/googleapis/google-api-java-client/commit/003ca44b4d41a73053eef2c46ba3ec2c8f135e95)) + ## [1.34.0](https://github.com/googleapis/google-api-java-client/compare/v1.33.4...v1.34.0) (2022-04-12) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index 226df4811..3073121f5 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -6,4 +6,32 @@ 8001 com/google/api/client/googleapis/auth/clientlogin/** + + 8001 + com/google/api/client/googleapis/apache/GoogleApacheHttpTransport + + + 7006 + com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException + com.google.android.gms.auth.GoogleAuthException getCause() + java.lang.Throwable + + + 7006 + com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException + java.lang.Throwable getCause() + com.google.android.gms.auth.GoogleAuthException + + + 7006 + com/google/api/client/googleapis/xml/atom/AtomPatchContent + com.google.api.client.http.xml.AbstractXmlHttpContent setMediaType(com.google.api.client.http.HttpMediaType) + com.google.api.client.http.AbstractHttpContent + + + 7006 + com/google/api/client/googleapis/xml/atom/AtomPatchContent + com.google.api.client.http.AbstractHttpContent setMediaType(com.google.api.client.http.HttpMediaType) + com.google.api.client.http.xml.AbstractXmlHttpContent + \ No newline at end of file diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 1a8bf6c61..c4e7514f9 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.34.0 + 1.35.0 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 8e942e30f..a1870abd2 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.34.0 + 1.35.0 ../pom.xml google-api-client-appengine @@ -41,7 +41,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index b23638331..63b7bf6ed 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.34.0 + 1.35.0 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 5c859225b..4f9dcc0d7 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.34.0 + 1.35.0 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 1.34.0 + 1.35.0 com.google.api-client google-api-client-android - 1.34.0 + 1.35.0 com.google.api-client google-api-client-appengine - 1.34.0 + 1.35.0 com.google.api-client google-api-client-assembly - 1.34.0 + 1.35.0 pom com.google.api-client google-api-client-gson - 1.34.0 + 1.35.0 com.google.api-client google-api-client-jackson2 - 1.34.0 + 1.35.0 com.google.api-client google-api-client-java6 - 1.34.0 + 1.35.0 com.google.api-client google-api-client-protobuf - 1.34.0 + 1.35.0 com.google.api-client google-api-client-servlet - 1.34.0 + 1.35.0 com.google.api-client google-api-client-xml - 1.34.0 + 1.35.0 @@ -118,7 +118,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true sonatype-nexus-staging @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 true @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-site-plugin - 3.11.0 + 3.12.0 true diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 7feb78d1f..c0603b8ee 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.34.0 + 1.35.0 ../pom.xml google-api-client-gson @@ -39,7 +39,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 2f0de64bb..75d79b8b2 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.34.0 + 1.35.0 ../pom.xml google-api-client-jackson2 @@ -39,7 +39,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 67f493345..09ee9e854 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.34.0 + 1.35.0 ../pom.xml google-api-client-java6 @@ -39,7 +39,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 910424811..cf78ed012 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.34.0 + 1.35.0 ../pom.xml google-api-client-protobuf @@ -46,7 +46,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index e9ba886d0..4bbe42e44 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.34.0 + 1.35.0 ../pom.xml google-api-client-servlet @@ -40,7 +40,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index d69ebb605..91278d025 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.34.0 + 1.35.0 ../pom.xml google-api-client-xml @@ -39,7 +39,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index be7d1e4f8..d66f8b90b 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.34.0 + 1.35.0 ../pom.xml google-api-client @@ -60,7 +60,7 @@ org.apache.felix maven-bundle-plugin - 5.1.4 + 5.1.6 bundle-manifest diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java deleted file mode 100644 index de2d95099..000000000 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Licensed 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. - */ - -package com.google.api.client.googleapis.apache; - -import com.google.api.client.googleapis.GoogleUtils; -import com.google.api.client.http.apache.ApacheHttpTransport; -import com.google.api.client.util.SslUtils; -import java.io.IOException; -import java.net.ProxySelector; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLContext; -import org.apache.http.client.HttpClient; -import org.apache.http.config.SocketConfig; -import org.apache.http.conn.socket.LayeredConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.impl.conn.SystemDefaultRoutePlanner; - -/** - * Utilities for Google APIs based on {@link ApacheHttpTransport}. - * - * @since 1.14 - * @author Yaniv Inbar - * @deprecated Use com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport - */ -@Deprecated -public final class GoogleApacheHttpTransport { - - /** - * Returns a new instance of {@link ApacheHttpTransport} that uses {@link - * GoogleUtils#getCertificateTrustStore()} for the trusted certificates. - * - * @deprecated Use - * com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport.newTrustedTransport() - */ - public static ApacheHttpTransport newTrustedTransport() - throws GeneralSecurityException, IOException { - // Set socket buffer sizes to 8192 - SocketConfig socketConfig = - SocketConfig.custom().setRcvBufSize(8192).setSndBufSize(8192).build(); - - PoolingHttpClientConnectionManager connectionManager = - new PoolingHttpClientConnectionManager(-1, TimeUnit.MILLISECONDS); - - // Disable the stale connection check (previously configured in the HttpConnectionParams - connectionManager.setValidateAfterInactivity(-1); - - // Use the included trust store - KeyStore trustStore = GoogleUtils.getCertificateTrustStore(); - SSLContext sslContext = SslUtils.getTlsSslContext(); - SslUtils.initSslContext(sslContext, trustStore, SslUtils.getPkixTrustManagerFactory()); - LayeredConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext); - - HttpClient client = - HttpClientBuilder.create() - .useSystemProperties() - .setSSLSocketFactory(socketFactory) - .setDefaultSocketConfig(socketConfig) - .setMaxConnTotal(200) - .setMaxConnPerRoute(20) - .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault())) - .setConnectionManager(connectionManager) - .disableRedirectHandling() - .disableAutomaticRetries() - .build(); - return new ApacheHttpTransport(client); - } - - private GoogleApacheHttpTransport() {} -} diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java index 7592d075c..6425875d1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java @@ -161,10 +161,11 @@ public final long getExpirationTimeMilliseconds() { * @return {@code true} if verified successfully or {@code false} if failed */ public boolean verify(GoogleIdToken googleIdToken) throws GeneralSecurityException, IOException { - // check the payload - if (!super.verify(googleIdToken)) { + // check the payload only + if (!super.verifyPayload(googleIdToken)) { return false; } + // verify signature, try all public keys in turn. for (PublicKey publicKey : publicKeys.getPublicKeys()) { if (googleIdToken.verifySignature(publicKey)) { 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 72ab6e937..3b8d3cc3d 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 @@ -37,6 +37,7 @@ import com.google.api.client.http.UriTemplate; import com.google.api.client.util.GenericData; import com.google.api.client.util.Preconditions; +import com.google.common.base.Joiner; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -164,6 +165,16 @@ static class ApiClientVersion { } public String toString() { + // When running the application as a native image, append `-graalvm` to the + // version. + String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); + if (imageCode != null && imageCode.equals("runtime")) { + String[] tokens = versionString.split(" "); + if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { + tokens[0] += "-graalvm"; + return Joiner.on(" ").join(tokens); + } + } return versionString; } 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 734e3900b..1eefdb139 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 @@ -261,6 +261,14 @@ public void testSetsApiClientHeaderWithOsVersion() { assertTrue("Api version should contain the os version", version.matches(".* my-os/1.2.3")); } + public void testSetsApiClientHeader_NativeImage() throws IOException { + System.setProperty("org.graalvm.nativeimage.imagecode", "runtime"); + System.setProperty("java.version", "11.0.0"); + String version = new ApiClientVersion().toString(); + assertTrue( + "Api version should contain -graalvm suffix", version.matches("gl-java/11.0.0-graalvm.*")); + } + public void testSetsApiClientHeaderWithoutOsVersion() { System.setProperty("os.name", "My OS"); System.clearProperty("os.version"); diff --git a/pom.xml b/pom.xml index adb4d05b5..3d3ef1494 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 1.34.0 + 1.35.0 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library @@ -227,7 +227,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true ossrh @@ -264,7 +264,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 attach-javadocs @@ -317,12 +317,12 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.2 + 3.3.0 org.apache.maven.plugins maven-site-plugin - 3.11.0 + 3.12.0 org.apache.maven.plugins @@ -493,15 +493,15 @@ UTF-8 - 1.41.7 + 1.41.8 4.4.15 4.5.13 - 1.33.2 + 1.34.0 3.0.2 2.8.6 - 3.19.4 + 3.21.0 31.1-jre - 2.0.4 + 2.0.5 1.1.4c 2.3-20090302111651 3.2.2 @@ -618,7 +618,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 com.microsoft.doclet.DocFxDoclet false diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 731a9df95..f3693e8e9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.api-client google-api-client - 1.33.4 + 1.34.1 diff --git a/samples/pom.xml b/samples/pom.xml index c8690ba19..fafa27bed 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9269ab5bb..4ad3da321 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.api-client google-api-client - 1.33.4 + 1.34.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ee46ef086..f7b08cdcf 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 25.1.0 + 25.3.0 pom import diff --git a/versions.txt b/versions.txt index 613bb6394..916570412 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.34.0:1.34.0 +google-api-client:1.35.0:1.35.0 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy