issue #15041 Updates adding versioning for java sdk and gradle task to build and...

diff --git a/sdk/java-v2/build.gradle b/sdk/java-v2/build.gradle
index eeec33369b5df6b0ded4c35a8da7d419beed7bb5..db9fe39b510e2bfdec7394a1ac5c3c1fb8aa2d5a 100644 (file)
--- a/sdk/java-v2/build.gradle
+++ b/sdk/java-v2/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'java-library'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'maven'
+apply plugin: 'signing'
 
-version = '2.0.0'
 
 repositories {
     mavenCentral()
@@ -48,3 +48,65 @@ task integrationTest(type: Test) {
         includeCategories 'org.arvados.client.junit.categories.IntegrationTests'
     }
 }
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives javadocJar, sourcesJar
+}
+
+signing {
+    sign configurations.archives
+}
+
+uploadArchives {
+  repositories {
+    mavenDeployer {
+      beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+      repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+        authentication(userName: ossrhUsername, password: ossrhPassword)
+      }
+
+      snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
+        authentication(userName: ossrhUsername, password: ossrhPassword)
+      }
+
+      pom.project {
+        name 'Arvados Java SDK'
+        packaging 'jar'
+        description 'Arvados Java SDK'
+        url 'https://github.com/curoverse/arvados'
+               
+       scm {
+         url 'scm:git@https://github.com/curoverse/arvados.git'
+         connection 'scm:git@https://github.com/curoverse/arvados.git'
+         developerConnection 'scm:git@https://github.com/curoverse/arvados.git'
+       }
+
+        licenses {
+          license {
+            name 'The Apache License, Version 2.0'
+            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+          }
+        }
+
+        developers {
+          developer {
+            id 'veritasgenetics'
+            name 'Veritas Genetics'
+            email 'ops@veritasgenetics.com'
+          }
+        }
+      }
+    }
+  }
+}

diff --git a/sdk/java-v2/settings.gradle b/sdk/java-v2/settings.gradle
index be8ccc6ca44ebae508e2471744830896c80a0b25..6bdaa3022519b0ddbe2ee85177e247d88eb754c4 100644 (file)
--- a/sdk/java-v2/settings.gradle
+++ b/sdk/java-v2/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'arvados-java'
+rootProject.name = 'arvados-java-sdk'

diff --git a/sdk/java-v2/test-in-docker.sh b/sdk/java-v2/test-in-docker.sh
index 1601909785775c2279345ba8701d402db168c25a..3880ddd808d489e8338edc98d509f2c38f03d632 100755 (executable)
--- a/sdk/java-v2/test-in-docker.sh
+++ b/sdk/java-v2/test-in-docker.sh
@@ -1,10 +1,50 @@
-#!/bin/sh
+#!/bin/bash -x
 #
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: AGPL-3.0 OR Apache-2.0
 #
-
 set -e
+
+format_last_commit_here() {
+    local format="$1"; shift
+    TZ=UTC git log -n1 --first-parent "--format=format:$format" .
+}
+
+version_from_git() {
+    # Output the version being built, or if we're building a
+    # dev/prerelease, output a version number based on the git log for
+    # the current working directory.
+    if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
+        echo "$ARVADOS_BUILDING_VERSION"
+        return
+    fi
+
+    local git_ts git_hash prefix
+    if [[ -n "$1" ]] ; then
+        prefix="$1"
+    else
+        prefix="0.1"
+    fi
+
+    declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
+    ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+    echo "$ARVADOS_BUILDING_VERSION"
+} 
+
+nohash_version_from_git() {
+    version_from_git $1 | cut -d. -f1-3
+}
+
+timestamp_from_git() {
+    format_last_commit_here "%ct"
+}
+if [[ -n "$1" ]]; then
+    build_version="$1"
+else
+    build_version="$(version_from_git)"
+fi
 #UID=$(id -u) # UID is read-only on many systems
-exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c '(gradle clean && gradle test); gradle --stop'
+#exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c '(gradle clean && gradle test); gradle --stop'
+#exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c 'gradle jar -Pversion='"$build_version"
+exec docker run --rm --user $UID -v $PWD:$PWD -w $PWD gradle /bin/sh -c 'gradle clean && gradle test && jar uploadArchives -Pversion='"$build_version" --info --stacktrace
\ No newline at end of file