requests;
diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle
index c69a8b9208..77553d3cf1 100644
--- a/gax-httpjson/build.gradle
+++ b/gax-httpjson/build.gradle
@@ -1,31 +1,32 @@
archivesBaseName = "gax-httpjson"
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
-project.version = "0.90.0" // {x-version-update:gax-httpjson:current}
+project.version = "0.91.1-SNAPSHOT" // {x-version-update:gax-httpjson:current}
dependencies {
- compile project(':gax'),
- libraries['maven.com_google_protobuf'],
- libraries['maven.com_google_protobuf_java_util'],
+ api(project(':gax'),
+ libraries['maven.com_google_api_api_common'],
+ libraries['maven.com_google_api_grpc_proto_google_common_protos'],
+ libraries['maven.com_google_auth_google_auth_library_credentials'],
libraries['maven.com_google_code_gson_gson'],
libraries['maven.com_google_guava_guava'],
- libraries['maven.com_google_code_findbugs_jsr305'],
- libraries['maven.org_threeten_threetenbp'],
libraries['maven.com_google_http_client_google_http_client'],
+ libraries['maven.com_google_protobuf'],
+ libraries['maven.org_threeten_threetenbp'])
+
+ implementation(libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
+ libraries['maven.com_google_code_findbugs_jsr305'],
libraries['maven.com_google_http_client_google_http_client_gson'],
- libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
- libraries['maven.com_google_auth_google_auth_library_credentials'],
- libraries['maven.com_google_api_grpc_proto_google_common_protos']
- libraries['maven.com_google_api_api_common']
+ libraries['maven.com_google_protobuf_java_util'])
compileOnly libraries['maven.com_google_auto_value_auto_value']
- testCompile project(':gax').sourceSets.test.output,
+ testImplementation(project(':gax').sourceSets.test.output,
libraries['maven.junit_junit'],
libraries['maven.org_mockito_mockito_core'],
- libraries['maven.com_google_truth_truth']
+ libraries['maven.com_google_truth_truth'])
- apt libraries['maven.com_google_auto_value_auto_value']
+ annotationProcessor libraries['maven.com_google_auto_value_auto_value']
shadowNoGuava libraries['maven.com_google_guava_guava']
}
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java
index e873c25192..db5e2a93a4 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java
@@ -74,7 +74,7 @@ static StatusCode.Code rpcCodeToStatusCode(com.google.rpc.Code rpcCode) {
case DEADLINE_EXCEEDED:
return Code.DEADLINE_EXCEEDED;
case NOT_FOUND:
- return Code.DEADLINE_EXCEEDED;
+ return Code.NOT_FOUND;
case ALREADY_EXISTS:
return Code.ALREADY_EXISTS;
case PERMISSION_DENIED:
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java
index 929d9d64c1..b24c0f8c25 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java
@@ -52,7 +52,6 @@
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Generated;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
@@ -121,7 +120,6 @@
*
* Please refer to the GitHub repository's samples for more quickstart code snippets.
*/
-@Generated("by gapic-generator-java")
@BetaApi
public class OperationsClient implements BackgroundResource {
private final OperationsSettings settings;
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java
index 42afe6c9f6..a22ab01d51 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java
@@ -52,7 +52,6 @@
import com.google.protobuf.Empty;
import java.io.IOException;
import java.util.List;
-import javax.annotation.Generated;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
@@ -85,7 +84,6 @@
* OperationsSettings operationsSettings = operationsSettingsBuilder.build();
* }
*/
-@Generated("by gapic-generator-java")
@BetaApi
public class OperationsSettings extends ClientSettings {
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java
index dc279501ce..d98991702c 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java
@@ -42,7 +42,6 @@
import com.google.api.gax.rpc.PagedCallSettings;
import com.google.api.gax.rpc.UnaryCallSettings;
import com.google.api.gax.rpc.UnaryCallable;
-import javax.annotation.Generated;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
@@ -50,7 +49,6 @@
*
* This class is for advanced usage.
*/
-@Generated("by gapic-generator-java")
@BetaApi
public class HttpJsonOperationsCallableFactory
implements HttpJsonStubCallableFactory {
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java
index 7684f5d9b9..ccc9ae2c9c 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java
@@ -65,7 +65,6 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Generated;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
@@ -73,7 +72,6 @@
*
* This class is for advanced usage and reflects the underlying API directly.
*/
-@Generated("by gapic-generator-java")
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public class HttpJsonOperationsStub extends OperationsStub {
private static final ApiMethodDescriptor
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java
index 0c125e0509..46755d1ce3 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java
@@ -41,7 +41,6 @@
import com.google.longrunning.ListOperationsResponse;
import com.google.longrunning.Operation;
import com.google.protobuf.Empty;
-import javax.annotation.Generated;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
@@ -49,7 +48,6 @@
*
* This class is for advanced usage and reflects the underlying API directly.
*/
-@Generated("by gapic-generator-java")
@BetaApi
public abstract class OperationsStub implements BackgroundResource {
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java
index 679ab36a35..ccee9b1f2f 100644
--- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java
+++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java
@@ -66,7 +66,6 @@
import com.google.protobuf.Empty;
import java.io.IOException;
import java.util.List;
-import javax.annotation.Generated;
import org.threeten.bp.Duration;
// AUTO-GENERATED DOCUMENTATION AND CLASS.
@@ -100,7 +99,6 @@
* OperationsStubSettings operationsSettings = operationsSettingsBuilder.build();
* }
*/
-@Generated("by gapic-generator-java")
@BetaApi
public class OperationsStubSettings extends StubSettings {
/** The default scopes of the service. */
diff --git a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonStatusCodeTest.java b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonStatusCodeTest.java
new file mode 100644
index 0000000000..7117026e86
--- /dev/null
+++ b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonStatusCodeTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google LLC nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.google.api.gax.httpjson;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import com.google.api.gax.rpc.StatusCode;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Test;
+
+public class HttpJsonStatusCodeTest {
+
+ @Test
+ public void rpcCodeToStatusCodeTest() {
+ Set allCodes = new HashSet<>();
+ for (com.google.rpc.Code rpcCode : com.google.rpc.Code.values()) {
+ StatusCode.Code statusCode;
+ try {
+ statusCode = HttpJsonStatusCode.rpcCodeToStatusCode(rpcCode);
+ } catch (IllegalArgumentException e) {
+ if (rpcCode != com.google.rpc.Code.UNRECOGNIZED) {
+ fail("Unrecognized com.google.rpc.Code found " + rpcCode);
+ }
+ continue;
+ }
+
+ assertNotNull(statusCode);
+ allCodes.add(statusCode);
+ }
+
+ assertEquals(allCodes, new HashSet<>(Arrays.asList(StatusCode.Code.values())));
+ }
+
+ @Test
+ public void httpStatusToStatusCodeTest() {
+ // The HTTP status code conversion logic is currently in the process of being standardized,
+ // the tested logic may change in nearest future.
+ final String defaultMessage = "anything";
+ assertEquals(
+ StatusCode.Code.OK, HttpJsonStatusCode.httpStatusToStatusCode(200, defaultMessage));
+ assertEquals(
+ StatusCode.Code.OUT_OF_RANGE,
+ HttpJsonStatusCode.httpStatusToStatusCode(400, HttpJsonStatusCode.OUT_OF_RANGE));
+ assertEquals(
+ StatusCode.Code.FAILED_PRECONDITION,
+ HttpJsonStatusCode.httpStatusToStatusCode(400, HttpJsonStatusCode.FAILED_PRECONDITION));
+ assertEquals(
+ StatusCode.Code.INVALID_ARGUMENT,
+ HttpJsonStatusCode.httpStatusToStatusCode(400, defaultMessage));
+ assertEquals(
+ StatusCode.Code.UNAUTHENTICATED,
+ HttpJsonStatusCode.httpStatusToStatusCode(401, defaultMessage));
+ assertEquals(
+ StatusCode.Code.PERMISSION_DENIED,
+ HttpJsonStatusCode.httpStatusToStatusCode(403, defaultMessage));
+ assertEquals(
+ StatusCode.Code.NOT_FOUND, HttpJsonStatusCode.httpStatusToStatusCode(404, defaultMessage));
+ assertEquals(
+ StatusCode.Code.ALREADY_EXISTS,
+ HttpJsonStatusCode.httpStatusToStatusCode(409, HttpJsonStatusCode.ALREADY_EXISTS));
+ assertEquals(
+ StatusCode.Code.ABORTED, HttpJsonStatusCode.httpStatusToStatusCode(409, defaultMessage));
+ assertEquals(
+ StatusCode.Code.RESOURCE_EXHAUSTED,
+ HttpJsonStatusCode.httpStatusToStatusCode(429, defaultMessage));
+ assertEquals(
+ StatusCode.Code.CANCELLED, HttpJsonStatusCode.httpStatusToStatusCode(499, defaultMessage));
+ assertEquals(
+ StatusCode.Code.DATA_LOSS,
+ HttpJsonStatusCode.httpStatusToStatusCode(500, HttpJsonStatusCode.DATA_LOSS));
+ assertEquals(
+ StatusCode.Code.UNKNOWN,
+ HttpJsonStatusCode.httpStatusToStatusCode(500, HttpJsonStatusCode.UNKNOWN));
+ assertEquals(
+ StatusCode.Code.INTERNAL, HttpJsonStatusCode.httpStatusToStatusCode(500, defaultMessage));
+ assertEquals(
+ StatusCode.Code.UNIMPLEMENTED,
+ HttpJsonStatusCode.httpStatusToStatusCode(501, defaultMessage));
+ assertEquals(
+ StatusCode.Code.UNAVAILABLE,
+ HttpJsonStatusCode.httpStatusToStatusCode(503, defaultMessage));
+ assertEquals(
+ StatusCode.Code.DEADLINE_EXCEEDED,
+ HttpJsonStatusCode.httpStatusToStatusCode(504, defaultMessage));
+
+ try {
+ HttpJsonStatusCode.httpStatusToStatusCode(411, defaultMessage);
+ fail();
+ } catch (IllegalStateException e) {
+ // expected
+ }
+
+ try {
+ HttpJsonStatusCode.httpStatusToStatusCode(666, defaultMessage);
+ fail();
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+}
diff --git a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java
index 131870e782..96a8ac7400 100644
--- a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java
+++ b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java
@@ -49,7 +49,6 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Generated;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -57,7 +56,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
-@Generated("by gapic-generator-java")
public class OperationsClientTest {
private static MockHttpService mockService;
private static OperationsClient client;
diff --git a/gax/build.gradle b/gax/build.gradle
index b4afd53e0f..2c0b779ca3 100644
--- a/gax/build.gradle
+++ b/gax/build.gradle
@@ -1,24 +1,27 @@
archivesBaseName = "gax"
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
-project.version = "2.5.0" // {x-version-update:gax:current}
+project.version = "2.6.1-SNAPSHOT" // {x-version-update:gax:current}
dependencies {
- compile libraries['maven.com_google_guava_guava'],
+ api(libraries['maven.com_google_api_api_common'],
+ libraries['maven.com_google_auth_google_auth_library_credentials'],
+ libraries['maven.org_threeten_threetenbp'])
+
+ implementation(libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
libraries['maven.com_google_code_findbugs_jsr305'],
- libraries['maven.org_threeten_threetenbp'],
- libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
- libraries['maven.com_google_api_api_common'],
- libraries['maven.io_opencensus_opencensus_api']
+ libraries['maven.com_google_guava_guava'],
+ libraries['maven.io_opencensus_opencensus_api'])
compileOnly libraries['maven.com_google_auto_value_auto_value']
- testCompile libraries['maven.junit_junit'],
+ testImplementation(libraries['maven.junit_junit'],
libraries['maven.org_mockito_mockito_core'],
libraries['maven.com_google_truth_truth'],
- libraries['maven.com_google_auto_value_auto_value']
+ libraries['maven.com_google_auto_value_auto_value'])
- apt libraries['maven.com_google_auto_value_auto_value']
+ annotationProcessor libraries['maven.com_google_auto_value_auto_value']
+ testAnnotationProcessor libraries['maven.com_google_auto_value_auto_value']
shadowNoGuava libraries['maven.com_google_guava_guava']
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0d4a951687..490fda8577 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c3b9..3ab0b725ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d517..2fe81a7d95 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
#!/usr/bin/env sh
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+# https://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.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -159,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a2..9109989e3c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/samples/pom.xml b/samples/pom.xml
index 04f6bfc366..4f7519a11a 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -14,13 +14,13 @@
com.google.api
gax
- 2.5.0
+ 2.6.1-SNAPSHOT
com.google.api
gax-grpc
- 2.5.0
+ 2.6.1-SNAPSHOT
com.google.auto.value
diff --git a/versions.txt b/versions.txt
index 6efe52ba72..bea7bc4b74 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-gax:2.5.0:2.5.0
-gax-bom:2.5.0:2.5.0
-gax-grpc:2.5.0:2.5.0
-gax-httpjson:0.90.0:0.90.0
-benchmark:0.75.0:0.75.0
+gax:2.6.0:2.6.1-SNAPSHOT
+gax-bom:2.6.0:2.6.1-SNAPSHOT
+gax-grpc:2.6.0:2.6.1-SNAPSHOT
+gax-httpjson:0.91.0:0.91.1-SNAPSHOT
+benchmark:0.76.0:0.76.1-SNAPSHOT