experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10734 from kbsriram/java-ops-jdk7-pinning

Browse Source 
Pin Java bindings to 1.7
This commit is contained in:
Shanqing Cai 2017-06-20 12:02:12 -04:00 committed by GitHub
commit 7ead916859
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tensorflow/java/build_defs.bzl
View File

@ -1,5 +1,14 @@
# -*- Python -*-
# Pin to Java 1.7 to ensure broader compatibility for the Java bindings on
# Android. Note also that the android_library bazel rule currently enforces
# java 7
# https://github.com/bazelbuild/bazel/blob/6c1106b1a721516d3b3db54d2e1c31b44a76fbb1/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java#L73
JAVA_VERSION_OPTS = [
"-source 7 -target 7",
]
# A more robust set of lint and errorprone checks when building
# Java source to improve code consistency.
@ -151,4 +160,4 @@ EP_DISABLED_CHECKS = [
EP_OPTS = EP_ENABLED_WARNINGS + EP_DISABLED_CHECKS
JAVACOPTS = XLINT_OPTS + EP_OPTS
JAVACOPTS = JAVA_VERSION_OPTS + XLINT_OPTS + EP_OPTS

4
tensorflow/java/maven/libtensorflow/pom.xml
View File

@ -19,8 +19,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>

4
tensorflow/java/maven/proto/pom.xml
View File

@ -27,8 +27,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>