From 27bcf3d8c535fa8193b3e612799c24918f86a90c Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 16 May 2019 12:13:27 -0700 Subject: [PATCH 1/2] Fix doc links to googleapis.dev --- README.md | 19 ++++--------------- google-api-client-appengine/pom.xml | 4 ++-- 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 | 4 ++-- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 4 ++-- pom.xml | 4 ++-- 10 files changed, 17 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index f2d3ec80d..71d6b1383 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ## Library Maintenance These client libraries are officially supported by Google. However, these libraries are considered complete and are in maintenance mode. This means that we will address critical bugs and security issues, but will not add any new features. If you're working with **Google Cloud Platform** APIs such as Datastore, Pub/Sub and many others, -consider using the [Cloud Client Libraries for Java](https://github.com/GoogleCloudPlatform/google-cloud-java) +consider using the [Cloud Client Libraries for Java](https://github.com/googleapis/google-cloud-java) instead. These are the new and idiomatic Java libraries targeted specifically at Google Cloud Platform Services. @@ -227,8 +227,8 @@ Java 11 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/ This library is built on top of two common libraries, also built by Google, and also designed to work with any HTTP service on the web: -- [Google HTTP Client Library for Java](https://github.com/google/google-http-java-client) -- [Google OAuth Client Library for Java](https://github.com/google/google-oauth-java-client) +- [Google HTTP Client Library for Java](https://github.com/googleapis/google-http-java-client) +- [Google OAuth Client Library for Java](https://github.com/googleapis/google-oauth-java-client) ## Important Warnings @@ -249,22 +249,11 @@ might result, and you are not guaranteed a compilation error. - [Developer's Guide](https://developers.google.com/api-client-library/java/google-api-java-client/dev-guide) - [Libraries and Samples](https://developers.google.com/api-client-library/java/apis/) -- [JavaDoc](https://developers.google.com/api-client-library/java/google-api-java-client/reference/index) +- [JavaDoc](https://googleapis.dev/java/google-api-client/latest/) - [Get Help](https://developers.google.com/api-client-library/java/google-api-java-client/support) ## Links -- [API Announcements](http://googledevelopers.blogspot.com/) - [Discuss](https://groups.google.com/forum/#!forum/google-api-java-client) -## Notice: Ending Java 6 Support - -Please note: since Java 6 extended support is being ended this December by Oracle, we will begin -ending Java 6 support in early 2019, with release 1.28.0 as a tentative goal. Users may still -use these libraries in Java 6 projects for some time, but going forward we will not ensure that -these libraries work in such an environment. After 1.28.0, our supported versions will include Java -7 and onward. - -For Android users, we will continue our 4.0 support. - For questions or concerns, please file an issue in the GitHub repository. diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 9c82c0db4..a56ba05b3 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -17,8 +17,8 @@ http://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ - https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index ecd1d4590..227217ef4 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 831fe24e6..b69a79bc3 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 58c6dbae8..f5bca159e 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index aae5a8ccf..370bd672c 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -23,7 +23,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index ec40c0944..4f1d96dcc 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -16,8 +16,8 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ - https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index ebe8cc0fc..da5bbdfe5 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 6ac537a11..ed8bed950 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -24,8 +24,8 @@ https://docs.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ - https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/pom.xml b/pom.xml index ff6cbebcd..50e2894c7 100644 --- a/pom.xml +++ b/pom.xml @@ -425,8 +425,8 @@ http://download.oracle.com/javase/7/docs/api/ http://cloud.google.com/appengine/docs/java/javadoc - https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ - https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ + https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ Google API Client Library for Java ${project.version} ${basedir}/overview.html From 223c9cfbd34b3d49c2fab348b08198a97f369fb2 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 16 May 2019 12:16:53 -0700 Subject: [PATCH 2/2] Fix references to Java 6 --- README.md | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 71d6b1383..b3ae9560d 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ To access other Google APIs, use the Google APIs Client Library for Java, which ### Other Java environments -- Java 6 (or higher) +- Java 7 (or higher) - Android 1.6 (or higher) - [Google App Engine](https://developers.google.com/api-client-library/java/google-api-java-client/app-engine) diff --git a/pom.xml b/pom.xml index 50e2894c7..f6242d92c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,11 +13,11 @@ pom Parent for the Google API Client Library for Java - https://github.com/google/google-api-java-client + https://github.com/googleapis/google-api-java-client GitHub - https://github.com/google/google-api-java-client/issues + https://github.com/googleapis/google-api-java-client/issues 2010 @@ -306,8 +306,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7