From 6578bad00e6125f13722ab322658c8569ad3595d Mon Sep 17 00:00:00 2001 From: Asim Shankar Date: Tue, 3 Jul 2018 19:12:03 -0700 Subject: [Java]: Release 1.9.0-rc2 PiperOrigin-RevId: 203218006 --- tensorflow/java/maven/hadoop/pom.xml | 168 ++++++++++- tensorflow/java/maven/libtensorflow/pom.xml | 2 +- tensorflow/java/maven/libtensorflow_jni/pom.xml | 2 +- .../java/maven/libtensorflow_jni_gpu/pom.xml | 2 +- tensorflow/java/maven/pom.xml | 2 +- tensorflow/java/maven/proto/pom.xml | 2 +- tensorflow/java/maven/run_inside_container.sh | 5 +- tensorflow/java/maven/spark-connector/pom.xml | 323 ++++++++++++++++++++- tensorflow/java/maven/tensorflow/pom.xml | 2 +- 9 files changed, 472 insertions(+), 36 deletions(-) (limited to 'tensorflow/java') diff --git a/tensorflow/java/maven/hadoop/pom.xml b/tensorflow/java/maven/hadoop/pom.xml index 0642be06fa..a160377210 100644 --- a/tensorflow/java/maven/hadoop/pom.xml +++ b/tensorflow/java/maven/hadoop/pom.xml @@ -1,12 +1,30 @@ - - + 4.0.0 - TensorFlow TFRecord InputFormat/OutputFormat for Apache Hadoop + org.tensorflow hadoop jar + 1.9.0-rc2 + tensorflow-hadoop + https://www.tensorflow.org + TensorFlow TFRecord InputFormat/OutputFormat for Apache Hadoop + + + UTF-8 + 1.6 + 1.6 + 2.6.0 + 3.3.1 + 4.11 + + + + + Apache License Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + https://github.com/tensorflow/ecosystem.git @@ -14,11 +32,133 @@ scm:git:https://github.com/tensorflow/ecosystem.git - https://github.com/tensorflow/ecosystem/ - - org.tensorflow - parentpom - 1.9.0-rc0 - ../ - - \ No newline at end of file + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + + org.tensorflow + proto + ${project.version} + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + com.google.protobuf + protobuf-java + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + + + com.google.protobuf + protobuf-java + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + junit + junit + ${junit.version} + test + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + ${hadoop.version} + test-jar + true + test + + + com.google.protobuf + protobuf-java + + + + + + + + + ossrh + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + bintray + + + + bintray + https://api.bintray.com/maven/google/tensorflow/tensorflow/;publish=0 + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + + + + TensorFlowers + TensorFlow + http://www.tensorflow.org + + + diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml index a7fa9ea5cc..489fb7bdb0 100644 --- a/tensorflow/java/maven/libtensorflow/pom.xml +++ b/tensorflow/java/maven/libtensorflow/pom.xml @@ -6,7 +6,7 @@ org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 ../ libtensorflow diff --git a/tensorflow/java/maven/libtensorflow_jni/pom.xml b/tensorflow/java/maven/libtensorflow_jni/pom.xml index 83aae29f1e..5bef85f75e 100644 --- a/tensorflow/java/maven/libtensorflow_jni/pom.xml +++ b/tensorflow/java/maven/libtensorflow_jni/pom.xml @@ -6,7 +6,7 @@ org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 ../ libtensorflow_jni diff --git a/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml b/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml index 50bd8ee5f9..8d93c78220 100644 --- a/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml +++ b/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml @@ -6,7 +6,7 @@ org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 ../ libtensorflow_jni_gpu diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml index b4746794ea..c5861102c8 100644 --- a/tensorflow/java/maven/pom.xml +++ b/tensorflow/java/maven/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 pom https://www.tensorflow.org diff --git a/tensorflow/java/maven/proto/pom.xml b/tensorflow/java/maven/proto/pom.xml index 618a2a124c..754caad900 100644 --- a/tensorflow/java/maven/proto/pom.xml +++ b/tensorflow/java/maven/proto/pom.xml @@ -6,7 +6,7 @@ org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 ../ proto diff --git a/tensorflow/java/maven/run_inside_container.sh b/tensorflow/java/maven/run_inside_container.sh index 2e771064e4..2240d6b7b9 100644 --- a/tensorflow/java/maven/run_inside_container.sh +++ b/tensorflow/java/maven/run_inside_container.sh @@ -203,7 +203,10 @@ download_tf_ecosystem() { cd "${ECOSYSTEM_DIR}" git clone "${TF_ECOSYSTEM_URL}" cd ecosystem - git checkout r${TF_VERSION} + # TF_VERSION is a semver string (..[-suffix]) + # but the branch is just (r.). + RELEASE_BRANCH=$(echo "${TF_VERSION}" | sed -e 's/\([0-9]\+\.[0-9]\+\)\.[0-9]\+.*/\1/') + git checkout r${RELEASE_BRANCH} # Copy the TensorFlow Hadoop source cp -r "${ECOSYSTEM_DIR}/ecosystem/hadoop/src" "${HADOOP_DIR}" diff --git a/tensorflow/java/maven/spark-connector/pom.xml b/tensorflow/java/maven/spark-connector/pom.xml index 19c752d08b..99237fdb98 100644 --- a/tensorflow/java/maven/spark-connector/pom.xml +++ b/tensorflow/java/maven/spark-connector/pom.xml @@ -1,12 +1,23 @@ - - + + 4.0.0 - TensorFlow TFRecord connector for Apache Spark DataFrames - spark-connector + org.tensorflow + spark-connector_2.11 jar + 1.9.0-rc2 + spark-tensorflow-connector + https://www.tensorflow.org + TensorFlow TFRecord connector for Apache Spark DataFrames + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + https://github.com/tensorflow/ecosystem.git @@ -14,11 +25,293 @@ scm:git:https://github.com/tensorflow/ecosystem.git - https://github.com/tensorflow/ecosystem/ - - org.tensorflow - parentpom - 1.9.0-rc0 - ../ - - \ No newline at end of file + + UTF-8 + 3.2.2 + 2.11 + 1.0 + 2.2.6 + 3.0 + 1.8 + 2.3.0 + 2.7.3 + 4.11 + + + + + + + true + net.alchim31.maven + scala-maven-plugin + ${scala.maven.version} + + + compile + + add-source + compile + + + + -Xms256m + -Xmx512m + + + -g:vars + -deprecation + -feature + -unchecked + -Xfatal-warnings + -language:implicitConversions + -language:existentials + + + + + test + + add-source + testCompile + + + + + incremental + true + ${scala.binary.version} + false + + + + true + org.scalatest + scalatest-maven-plugin + ${scalatest.maven.version} + + + scalaTest + test + + test + + + + + + + maven-shade-plugin + 3.1.0 + + + package + + shade + + + true + + + com.google.protobuf:protobuf-java + org.tensorflow:hadoop + org.tensorflow:proto + + + + + + com.google.protobuf:protobuf-java + + **/*.java + + + + + + com.google.protobuf + + org.tensorflow.spark.shaded.com.google.protobuf + + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-shade-plugin + + + org.scalatest + scalatest-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${java.version} + ${java.version} + + + + + + + + test + + true + + !NEVERSETME + + + + + + net.alchim31.maven + scala-maven-plugin + + + + + + + org.scalatest + scalatest_${scala.binary.version} + ${scala.test.version} + test + + + + + + org.scalatest + scalatest_${scala.binary.version} + test + + + + + + + ossrh + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + bintray + + + + bintray + https://api.bintray.com/maven/google/tensorflow/tensorflow/;publish=0 + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + + + + TensorFlowers + TensorFlow + http://www.tensorflow.org + + + + + + org.tensorflow + hadoop + ${project.version} + + + org.apache.spark + spark-core_${scala.binary.version} + ${spark.version} + provided + + + org.apache.spark + spark-sql_${scala.binary.version} + ${spark.version} + provided + + + org.apache.spark + spark-mllib_${scala.binary.version} + ${spark.version} + provided + + + org.apache.hadoop + hadoop-yarn-api + ${yarn.api.version} + provided + + + org.apache.spark + spark-mllib_${scala.binary.version} + ${spark.version} + test-jar + test + + + junit + junit + ${junit.version} + test + + + diff --git a/tensorflow/java/maven/tensorflow/pom.xml b/tensorflow/java/maven/tensorflow/pom.xml index 157c4b8e82..2a8e640dbc 100644 --- a/tensorflow/java/maven/tensorflow/pom.xml +++ b/tensorflow/java/maven/tensorflow/pom.xml @@ -6,7 +6,7 @@ org.tensorflow parentpom - 1.9.0-rc1 + 1.9.0-rc2 ../ tensorflow -- cgit v1.2.3