Merge branch '14670-new-java-sdk-docs' refs #14670

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --combined .licenseignore
index 405fe8ddf9e15d4a7b82261bab230df20fa99699,e8e99c02f6d4bf5512ce28877516f09f1743bca6..a9b6f5f6cafdbedb1a202f5f9c0e3526e7a54549
--- 1/.licenseignore
--- 2/.licenseignore
+++ b/.licenseignore
@@@ -13,7 -13,6 +13,7 @@@ build/package-test-dockerfiles/ubuntu16
  *by-sa-3.0.txt
  *COPYING
  doc/fonts/*
 +doc/_includes/_config_default_yml.liquid
  doc/user/cwl/federated/*
  */docker_image
  docker/jobs/apt.arvados.org*.list
@@@ -60,7 -59,6 +60,7 @@@ sdk/pam/examples/shellinabo
  sdk/pam/pam-configs/arvados
  sdk/python/tests/data/*
  services/api/config/unbound.template
 +services/api/config/config.default.yml
  services/arv-web/sample-cgi-app/public/.htaccess
  services/arv-web/sample-cgi-app/public/index.cgi
  services/keepproxy/pkg-extras/etc/default/keepproxy
@@@ -76,3 -74,5 +76,5 @@@ sdk/R/ArvadosR.Rpro
  *.Rd
  lib/dispatchcloud/test/sshkey_*
  *.asc
+ sdk/java-v2/build.gradle
+ sdk/java-v2/settings.gradle

diff --combined build/run-tests.sh
index 714143b13016c8c9873ae29f9256876789db5cbe,6bc8b84f856c8d6899fb5666f6ba51c0ba14a02d..8ff6326f37a4c869e3ed13e3321b179514ce003d
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -122,6 -122,7 +122,7 @@@ sdk/go/stat
  sdk/go/crunchrunner
  sdk/cwl
  sdk/R
+ sdk/java-v2
  tools/sync-groups
  tools/crunchstat-summary
  tools/crunchstat-summary:py3
@@@ -394,7 -395,7 +395,7 @@@ start_services() 
          return 0
      fi
      . "$VENVDIR/bin/activate"
 -    echo 'Starting API, keepproxy, keep-web, ws, arv-git-httpd, and nginx ssl proxy...'
 +    echo 'Starting API, controller, keepproxy, keep-web, arv-git-httpd, ws, and nginx ssl proxy...'
      if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
        mkdir -p "$WORKSPACE/services/api/log"
      fi
@@@ -749,7 -750,6 +750,7 @@@ do_test_once() 
      title "test $1"
      timer_reset
  
 +    result=
      if which deactivate >/dev/null; then deactivate; fi
      if ! . "$VENVDIR/bin/activate"
      then
@@@ -822,7 -822,6 +823,7 @@@ do_install_once() 
      title "install $1"
      timer_reset
  
 +    result=
      if which deactivate >/dev/null; then deactivate; fi
      if [[ "$1" != "env" ]] && ! . "$VENVDIR/bin/activate"; then
          result=1
@@@ -957,7 -956,6 +958,7 @@@ install_services/api() 
              || return 1
  
      cd "$WORKSPACE/services/api" \
 +        && RAILS_ENV=test bundle exec rails db:environment:set \
          && RAILS_ENV=test bundle exec rake db:drop \
          && RAILS_ENV=test bundle exec rake db:setup \
          && RAILS_ENV=test bundle exec rake db:fixtures:load
@@@ -1070,6 -1068,10 +1071,10 @@@ test_sdk/cli() 
          && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
  }
  
+ test_sdk/java-v2() {
+     cd "$WORKSPACE/sdk/java-v2" && gradle test
+ }
+ 
  test_services/login-sync() {
      cd "$WORKSPACE/services/login-sync" \
          && bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
@@@ -1167,6 -1169,7 +1172,7 @@@ test_all() 
      do_test sdk/R
      do_test sdk/cli
      do_test services/login-sync
+     do_test sdk/java-v2
      do_test services/nodemanager_integration
      for p in "${pythonstuff[@]}"
      do

diff --combined doc/_config.yml
index c7f9bd19788448ef97af679ba917ed2cba530d27,289167b7588abe4c04b7a5cef77d0ce09dfa2303..cfae671929c0c69a7f63672ee584348d751a3975
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -104,7 -104,11 +104,11 @@@ navbar
      - Ruby:
        - sdk/ruby/index.html.textile.liquid
        - sdk/ruby/example.html.textile.liquid
-     - Java:
+     - Java v2:
+       - sdk/java-v2/index.html.textile.liquid
+       - sdk/java-v2/example.html.textile.liquid
+       - sdk/java-v2/javadoc.html.textile.liquid
+     - Java v1:
        - sdk/java/index.html.textile.liquid
        - sdk/java/example.html.textile.liquid
    api:
@@@ -154,11 -158,8 +158,11 @@@
    admin:
      - Topics:
        - admin/index.html.textile.liquid
 +    - Configuration:
 +      - admin/config.html.textile.liquid
      - Upgrading and migrations:
        - admin/upgrading.html.textile.liquid
 +      - admin/config-migration.html.textile.liquid
        - install/migrate-docker19.html.textile.liquid
        - admin/upgrade-crunch2.html.textile.liquid
      - Users and Groups:
@@@ -177,8 -178,6 +181,8 @@@
      - Other:
        - admin/collection-versioning.html.textile.liquid
        - admin/federation.html.textile.liquid
 +      - admin/controlling-container-reuse.html.textile.liquid
 +      - admin/logs-table-management.html.textile.liquid
    installguide:
      - Overview:
        - install/index.html.textile.liquid