aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-01-24 23:41:32 -0800
committerGitHub <noreply@github.com>2018-01-24 23:41:32 -0800
commit1d02e45468630f566e730b2ac3b79a9f2c4533dd (patch)
treee132ec31721918cc58924336756f169fcaef0084
parent80e016e83898b2bd4f197f1d57c7e1453828e846 (diff)
parent019ceea4b3e4fdc127dc7e978b53e5ec166c9062 (diff)
downloadprotobuf-1d02e45468630f566e730b2ac3b79a9f2c4533dd.tar.gz
protobuf-1d02e45468630f566e730b2ac3b79a9f2c4533dd.tar.bz2
protobuf-1d02e45468630f566e730b2ac3b79a9f2c4533dd.zip
Merge pull request #4224 from davido/drop_java_6_support
Drop java 6 support
-rw-r--r--BUILD4
-rw-r--r--java/pom.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/BUILD b/BUILD
index 547181e8..2902e9e2 100644
--- a/BUILD
+++ b/BUILD
@@ -608,7 +608,7 @@ java_library(
]) + [
":gen_well_known_protos_java",
],
- javacopts = ["-source 6", "-target 6"],
+ javacopts = ["-source 7", "-target 7"],
visibility = ["//visibility:public"],
)
@@ -617,7 +617,7 @@ java_library(
srcs = glob([
"java/util/src/main/java/com/google/protobuf/util/*.java",
]),
- javacopts = ["-source 6", "-target 6"],
+ javacopts = ["-source 7", "-target 7"],
visibility = ["//visibility:public"],
deps = [
"protobuf_java",
diff --git a/java/pom.xml b/java/pom.xml
index 6e339d7f..b7c3e485 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -96,8 +96,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>