Must NOT be implemented in form of an anonymous class as this will break serialization.
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 859ab90be..2de030f94 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0../pom.xmlgoogle-api-client-jackson2
@@ -39,7 +39,7 @@
org.apache.felixmaven-bundle-plugin
- 5.1.8
+ 5.1.9bundle-manifest
diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
index 49abca2c3..cc8519c9e 100644
--- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
+++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
@@ -22,7 +22,7 @@
/**
* {@link Beta}
- * A {@link TypedNotificationCallback} which uses an JSON content encoding with {@link
+ * A {@link TypedNotificationCallback} which uses a JSON content encoding with {@link
* GsonFactory#getDefaultInstance()}.
*
*
Must NOT be implemented in form of an anonymous class as this will break serialization.
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 30d96e61a..b84b8a74e 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0../pom.xmlgoogle-api-client-protobuf
@@ -46,7 +46,7 @@
org.apache.felixmaven-bundle-plugin
- 5.1.8
+ 5.1.9bundle-manifest
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index 45ec9d71b..85bf22cb0 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -4,7 +4,7 @@
com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0../pom.xmlgoogle-api-client-servlet
@@ -40,7 +40,7 @@
org.apache.felixmaven-bundle-plugin
- 5.1.8
+ 5.1.9bundle-manifest
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index be32e6367..96515eac5 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -4,7 +4,7 @@
com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0../pom.xmlgoogle-api-client-xml
@@ -39,7 +39,7 @@
org.apache.felixmaven-bundle-plugin
- 5.1.8
+ 5.1.9bundle-manifest
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index 3bb3dd0c8..f311d3168 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -4,7 +4,7 @@
com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0../pom.xmlgoogle-api-client
@@ -60,7 +60,7 @@
org.apache.felixmaven-bundle-plugin
- 5.1.8
+ 5.1.9bundle-manifest
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 19c7f30c9..c15c8a458 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
@@ -93,7 +93,8 @@ private static String getVersion() {
// this value should be read and cached for later use
String version = null;
try (InputStream inputStream =
- GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
+ GoogleUtils.class.getResourceAsStream(
+ "/com/google/api/client/googleapis/google-api-client.properties")) {
if (inputStream != null) {
Properties properties = new Properties();
properties.load(inputStream);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
index 83910284b..dbf7fd769 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
@@ -56,9 +56,9 @@ public class CloudShellCredential extends GoogleCredential {
private static final int READ_TIMEOUT_MS = 5000;
/**
- * The Cloud Shell back authorization channel uses serialized Javascript Protobufers, preceeded by
+ * The Cloud Shell back authorization channel uses serialized Javascript Protobufers, preceded by
* the message lengeth and a new line character. However, the request message has no content, so a
- * token request consists of an empty JsPb, and its 2 character lenth prefix.
+ * token request consists of an empty JsPb, and its 2 character length prefix.
*/
protected static final String GET_AUTH_TOKEN_REQUEST = "2\n[]";
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
index 4198e82b5..9f1534a19 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
@@ -294,7 +294,7 @@ private boolean useGAEStandardAPI() {
throw OAuth2Utils.exceptionWithCause(
new RuntimeException(
String.format(
- "Unexpcted error trying to determine if runnning on Google App Engine: %s",
+ "Unexpected error trying to determine if running on Google App Engine: %s",
cause.getMessage())),
cause);
}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
index c2d38d586..68e46fbf9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
@@ -195,7 +195,7 @@ public Payload setEmail(String email) {
*
* @since 1.10
*
Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"}
- * and returns a boolean, but starting with verison 1.17, it now accesses {@code
+ * and returns a boolean, but starting with version 1.17, it now accesses {@code
* "email_verified"} and returns a Boolean. Previously, if this value was not specified,
* this method would return {@code false}, but now it returns {@code null}.
*/
@@ -218,7 +218,7 @@ public Boolean getEmailVerified() {
*
* @since 1.10
*
Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"}
- * and required a boolean parameter, but starting with verison 1.17, it now accesses {@code
+ * and required a boolean parameter, but starting with version 1.17, it now accesses {@code
* "email_verified"} and requires a Boolean parameter.
*/
public Payload setEmailVerified(Boolean emailVerified) {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
index 9cf443d7b..efd7dac18 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
@@ -40,7 +40,7 @@
* automatically be refreshed using the refresh token (if applicable).
*
*
- *
These are the typical steps of the the browser-based client flow specified in These are the typical steps of the browser-based client flow specified in Using OAuth 2.0 for
* Client-side Applications:
*
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 6ea87a96f..078c56d75 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
@@ -235,7 +235,7 @@ public enum UploadState {
*/
private boolean disableGZipContent;
- /** Sleeper. * */
+ /** Sleeper. */
Sleeper sleeper = Sleeper.DEFAULT;
/**
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
index b2599f5b2..3509f3943 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
@@ -148,7 +148,7 @@ public String getClientToken() {
}
/**
- * Sets the the arbitrary string provided by the client associated with this subscription that is
+ * Sets the arbitrary string provided by the client associated with this subscription that is
* delivered to the target address with each notification or {@code null} for none.
*/
public StoredChannel setClientToken(String clientToken) {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
index bc0421017..7bf642413 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
@@ -22,7 +22,7 @@
/**
* {@link Beta}
- * A {@link TypedNotificationCallback} which uses an JSON content encoding.
+ * A {@link TypedNotificationCallback} which uses a JSON content encoding.
*
*
Must NOT be implemented in form of an anonymous class as this will break serialization.
*
diff --git a/pom.xml b/pom.xml
index fe6c58dba..6b30b24e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0com.google.api-clientgoogle-api-client-parent
- 2.2.0
+ 2.3.0pomParent for the Google API Client Library for JavaThe Google APIs Client Library for Java is a Java client library
@@ -242,11 +242,11 @@