Merge pull request tensorflow#3 from tensorflow/master

Sync with master tensorflow on upstream

Author: JimClarke5

.github/workflows/ci.yml

@@ -3,10 +3,14 @@ on:
   push:
     branches:
       - master
+      - r[0-9]+.*
   pull_request:
     branches:
       - master
     types: [opened, reopened, synchronize, labeled, unlabeled]
+env:
+  STAGING_PROFILE_ID: 46f80d0729c92d
+  NATIVE_BUILD_PROJECTS: tensorflow-core/tensorflow-core-generator,tensorflow-core/tensorflow-core-api
 jobs:
   quick-build:
     if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
@@ -19,10 +23,27 @@ jobs:
           git --version
           mvn -version
           mvn clean install -Pdev -B -U -e
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      stagingRepositoryId: ${{ steps.staging.outputs.stagingRepositoryId }}
+    steps:
+      - name: Create staging repository
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/r')
+        id: staging
+        run: |
+          echo "Creating staging repository with profile $STAGING_PROFILE_ID"
+          echo "<promoteRequest><data><description>Releasing TF Java - created by CI build</description></data></promoteRequest>" > request.xml
+          curl -X POST -d @request.xml -s -o response.xml -u ${{ secrets.CI_DEPLOY_USERNAME }}:${{ secrets.CI_DEPLOY_PASSWORD }} -H "Content-Type:application/xml" \
+              https://oss.sonatype.org/service/local/staging/profiles/$STAGING_PROFILE_ID/start
+          STAGING_REPOSITORY_ID=`awk -F'[<>]' '/stagedRepositoryId/{print $3}' response.xml`
+          echo "Staging repository created: $STAGING_REPOSITORY_ID"
+          echo "::set-output name=stagingRepositoryId::$STAGING_REPOSITORY_ID"
   linux-x86_64:
     if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: ubuntu-latest
     container: centos:7
+    needs: prepare
     strategy:
       matrix:
         ext: ["", -mkl, -gpu, -mkl-gpu]
@@ -66,11 +87,12 @@ jobs:
           [[ "${{ github.event_name }}" == "push" ]] && MAVEN_PHASE=deploy || MAVEN_PHASE=install
           echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
           echo Executing Maven $MAVEN_PHASE
-          mvn clean $MAVEN_PHASE -Possrh -B -U -e -Djavacpp.platform=linux-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }}
+          mvn clean $MAVEN_PHASE -B -U -e -Djavacpp.platform=linux-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl $NATIVE_BUILD_PROJECTS -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }}
           df -h
   macosx-x86_64:
     if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: macos-latest
+    needs: prepare
     strategy:
       matrix:
         ext: ["", -mkl]
@@ -95,14 +117,15 @@ jobs:
           echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
           df -h
           echo Executing Maven $MAVEN_PHASE
-          mvn clean $MAVEN_PHASE -Possrh -B -U -e -Djavacpp.platform=macosx-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }}
+          mvn clean $MAVEN_PHASE -B -U -e -Djavacpp.platform=macosx-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl $NATIVE_BUILD_PROJECTS -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }}
           df -h
   windows-x86_64:
     if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: windows-latest
-    #    strategy:
-    #      matrix:
-    #        ext: ["", -mkl, -gpu, -mkl-gpu]
+    needs: prepare
+    strategy:
+       matrix:
+         ext: ["", -mkl] # -gpu, -mkl-gpu]
     steps:
       - name: Configure page file
         uses: al-cheb/[email protected]
@@ -153,29 +176,18 @@ jobs:
           df -h
           wmic pagefile list /format:list
           echo Executing Maven %MAVEN_PHASE%
-          call mvn clean %MAVEN_PHASE% -Possrh -B -U -e -Djavacpp.platform=windows-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }}
+          call mvn clean %MAVEN_PHASE% -B -U -e -Djavacpp.platform=windows-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl %NATIVE_BUILD_PROJECTS% -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }}
           if ERRORLEVEL 1 exit /b
           df -h
           wmic pagefile list /format:list
-  redeploy:
-    if: github.event_name == 'push'
+  deploy:
+    if: github.event_name == 'push' && contains(github.ref, 'master')
     needs: [linux-x86_64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - name: Redeploy snapshot artifacts
+      - name: Deploy snapshot artifacts
         run: |
-          cd tensorflow-core
-          mvn dependency:resolve -Possrh -Predeploy -N -B -U -e
-          cp $HOME/.m2/repository/org/tensorflow/tensorflow-core-api/*-SNAPSHOT/tensorflow-core-api-*-SNAPSHOT*.jar .
-          for f in *.jar; do
-            if [[ $f =~ tensorflow-core-api-.*SNAPSHOT-(.*).jar ]]; then
-              [[ -n $FILES ]] && FILES=$FILES,$f || FILES=$f
-              [[ -n $TYPES ]] && TYPES=$TYPES,jar || TYPES=jar
-              [[ -n $CLASSIFIERS ]] && CLASSIFIERS=$CLASSIFIERS,${BASH_REMATCH[1]} || CLASSIFIERS=${BASH_REMATCH[1]}
-            fi
-          done
-          echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
-          unzip -o tensorflow-core-api-*-SNAPSHOT.jar META-INF/maven/org.tensorflow/tensorflow-core-api/pom.xml
-          mvn clean deploy -Possrh -Predeploy -N -B -U -e -Dfiles=$FILES -Dtypes=$TYPES -Dclassifiers=$CLASSIFIERS
+          echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > settings.xml
+          bash deploy.sh

README.md

@@ -85,12 +85,12 @@ systems, you should add the following dependencies:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
   <classifier>linux-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 ```
@@ -101,24 +101,24 @@ native dependencies as follows:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
   <classifier>linux-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
   <classifier>macosx-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
   <classifier>windows-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 ```
@@ -131,7 +131,7 @@ artifact includes transitively all the artifacts above as a single dependency:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-platform${javacpp.platform.extension}</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.2.0</version>
 </dependency>
 ```
 
@@ -143,7 +143,7 @@ the conventions established on this page:
 
 ### Snapshots
 
-Artifacts resulting from this repository are actually only available as snapshots and to retrieve them, you need
+Snapshots of TensorFlow Java artifacts are automatically distributed after each update in the code. To use them, you need
 to add Sonatype OSS repository in your pom.xml, like the following
 
 ```xml
@@ -161,7 +161,7 @@ to add Sonatype OSS repository in your pom.xml, like the following
     <dependency>
         <groupId>org.tensorflow</groupId>
         <artifactId>tensorflow-core-platform</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
     </dependency>
 </dependencies>
 ```
@@ -173,7 +173,9 @@ This table shows the mapping between different version of TensorFlow for Java an
 | TensorFlow Java Version  | TensorFlow Version |
 | ------------- | ------------- |
 | 0.1.0-SNAPSHOT  | 2.2.0  |
-| 0.2.0-SNAPSHOT  | 2.3.0  |
+| 0.2.0-SNAPSHOT  | 2.3.1  |
+| 0.2.0  | 2.3.1  |
+| 0.3.0-SNAPSHOT  | 2.3.1  |
 
 ## How to Contribute?