From 8fa961f2ab6fb4c90564d196a2937507beb15f98 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 11 Dec 2018 12:16:14 -0800 Subject: [PATCH 1/2] Compile to Java 1.7 binary --- google-http-client-appengine/pom.xml | 2 +- .../google-http-client-findbugs-test/pom.xml | 4 ++-- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index d0cb381c2..88d95c00f 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -43,7 +43,7 @@ org.codehaus.mojo.signature - java16 + java17 1.0 diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml index 09ea2382c..3efde56f3 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml +++ b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml @@ -13,8 +13,8 @@ maven-compiler-plugin 2.3.2 - 1.5 - 1.5 + 1.7 + 1.7 diff --git a/pom.xml b/pom.xml index 3794f581a..50d89cefc 100644 --- a/pom.xml +++ b/pom.xml @@ -294,8 +294,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7 @@ -505,7 +505,7 @@ org.codehaus.mojo.signature - java16 + java17 1.0 From f1091f224f796278d1b1abec58c6b5bb4f760652 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 11 Dec 2018 16:00:20 -0800 Subject: [PATCH 2/2] Fix javadoc links to official Java 7 docs --- google-http-client-android/pom.xml | 2 +- google-http-client-appengine/pom.xml | 2 +- google-http-client-gson/pom.xml | 2 +- google-http-client-jackson/pom.xml | 2 +- google-http-client-jackson2/pom.xml | 2 +- google-http-client-jdo/pom.xml | 2 +- google-http-client-protobuf/pom.xml | 2 +- google-http-client-test/pom.xml | 2 +- google-http-client-xml/pom.xml | 2 +- google-http-client/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 05d531e92..a6d337978 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 88d95c00f..a5272e118 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ ${project.name} ${project.version} diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index ce30b92ec..7905ce151 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ https://www.javadoc.io/doc/com.google.code.gson/gson/${project.gson.version} ${project.name} ${project.version} diff --git a/google-http-client-jackson/pom.xml b/google-http-client-jackson/pom.xml index 12584dd17..b800f633a 100644 --- a/google-http-client-jackson/pom.xml +++ b/google-http-client-jackson/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ https://jar-download.com/artifacts/org.codehaus.jackson/jackson-core-asl/${project.jackson-core-asl.version}/documentation ${project.name} ${project.version} diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index 4eaa6cf29..73c04749c 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ http://fasterxml.github.com/jackson-core/javadoc/${project.jackson-core2.version}/ ${project.name} ${project.version} diff --git a/google-http-client-jdo/pom.xml b/google-http-client-jdo/pom.xml index 6a42bdf0c..f0303f451 100644 --- a/google-http-client-jdo/pom.xml +++ b/google-http-client-jdo/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 0f741b8f0..0a98346ac 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -24,7 +24,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index 03fc43773..e7c843615 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index a2bff67fe..f731ce066 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -17,7 +17,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 69bf450f4..03b60de19 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -21,7 +21,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ https://google.github.io/guava/releases/${project.guava.version}/api/docs/ https://commons.apache.org/proper/commons-codec/archives/${project.commons-codec.version}/apidocs/ diff --git a/pom.xml b/pom.xml index 50d89cefc..60b173ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -399,7 +399,7 @@ site - http://download.oracle.com/javase/6/docs/api/ + http://download.oracle.com/javase/7/docs/api/ http://cloud.google.com/appengine/docs/java/javadoc https://jar-download.com/artifacts/org.codehaus.jackson/jackson-core-asl/${project.jackson-core-asl.version}/documentation http://fasterxml.github.com/jackson-core/javadoc/${project.jackson-core2.version}/