diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index 26321cc2f..580a94a0f 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -16,7 +16,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index 0c02450df..be856b656 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index 07d258d54..184dcb62d 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index a8800ec7a..4cfdfbbf9 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index cc1ffec49..f6c4392ec 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
@@ -51,7 +51,7 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
+            <artifactId>java17</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 59edd7f6b..ac3c5dd20 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index ec686676b..2b441eb7d 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index c76505c73..e30f01b61 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -15,7 +15,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
+            <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>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index fba838035..2a2677b34 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>https://docs.oracle.com/javase/6/docs/api/</link>
+            <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>
diff --git a/pom.xml b/pom.xml
index 0a0d81e3b..b4ffd1e3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,7 +397,7 @@
             <phase>site</phase>
             <configuration>
               <links>
-                <link>http://download.oracle.com/javase/6/docs/api/</link>
+                <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>
@@ -499,7 +499,7 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
+            <artifactId>java17</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>