Fix doc links to googleapis.dev (#1257)

* Fix doc links to googleapis.dev * Fix references to Java 6
googleapis · May 17, 2019 · 1b03b44 · 1b03b44
1 parent 85b3192
commit 1b03b44
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 33 deletions.
diff --git 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.
 
@@ -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)
 
@@ -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
@@ -17,8 +17,8 @@
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
             <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
-            <link>https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
@@ -16,7 +16,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
@@ -16,7 +16,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
@@ -16,7 +16,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
@@ -23,7 +23,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
@@ -16,8 +16,8 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
-            <link>https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
@@ -16,7 +16,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
@@ -24,8 +24,8 @@
           <links>
             <link>https://docs.oracle.com/javase/7/docs/api/</link>
             <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
-            <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
-            <link>https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>

diff --git a/pom.xml b/pom.xml
@@ -13,11 +13,11 @@
   <packaging>pom</packaging>
   <name>Parent for the Google API Client Library for Java</name>
 
-  <url>https://github.com/google/google-api-java-client</url>
+  <url>https://github.com/googleapis/google-api-java-client</url>
 
   <issueManagement>
     <system>GitHub</system>
-    <url>https://github.com/google/google-api-java-client/issues</url>
+    <url>https://github.com/googleapis/google-api-java-client/issues</url>
   </issueManagement>
 
   <inceptionYear>2010</inceptionYear>
@@ -306,8 +306,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.3.2</version>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.7</source>
+            <target>1.7</target>
           </configuration>
         </plugin>
 
@@ -425,8 +425,8 @@
               <links>
                 <link>http://download.oracle.com/javase/7/docs/api/</link>
                 <link>http://cloud.google.com/appengine/docs/java/javadoc</link>
-                <link>https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/</link>
-                <link>https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/</link>
+                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+                <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
               </links>
               <doctitle>Google API Client Library for Java ${project.version}</doctitle>
               <overview>${basedir}/overview.html</overview>