[ARVADOS] updated: 1.3.0-726-g72ff1a0ba
Git user
git at public.curoverse.com
Tue Apr 16 20:07:29 UTC 2019
Summary of changes:
.licenseignore | 2 ++
sdk/java-v2/build.gradle | 64 ++++++++++++++++++++++++++++++++++++++++++-
sdk/java-v2/settings.gradle | 2 +-
sdk/java-v2/test-in-docker.sh | 46 +++++++++++++++++++++++++++++--
4 files changed, 109 insertions(+), 5 deletions(-)
via 72ff1a0bace622efe975820e41c456d9a7934a75 (commit)
via 0df5f0feeced5bff0adfb806dae2d3811257827f (commit)
via aade7ad1ade9b6a1f2a0f295368f92f130e0ed9a (commit)
from ef9ad9c4771dbcd90d884fdb2c55344434d59bd9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 72ff1a0bace622efe975820e41c456d9a7934a75
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Apr 16 17:07:07 2019 -0300
issue #15041 Updates adding versioning for java sdk and gradle task to build and publish it. gradle publish include push to sonatype \nArvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/.licenseignore b/.licenseignore
index 45028bf88..e8e99c02f 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -74,3 +74,5 @@ sdk/R/ArvadosR.Rproj
*.Rd
lib/dispatchcloud/test/sshkey_*
*.asc
+sdk/java-v2/build.gradle
+sdk/java-v2/settings.gradle
commit 0df5f0feeced5bff0adfb806dae2d3811257827f
Merge: aade7ad1a ef9ad9c47
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Apr 16 16:54:28 2019 -0300
Merge branch '14670-new-java-sdk-docs' of git.curoverse.com:arvados into 14670-new-java-sdk-docs
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
commit aade7ad1ade9b6a1f2a0f295368f92f130e0ed9a
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Apr 16 16:53:27 2019 -0300
issue #15041 Updates adding versioning for java sdk and gradle task to build and publish it. gradle publish include push to sonatype \nArvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/sdk/java-v2/build.gradle b/sdk/java-v2/build.gradle
index eeec33369..db9fe39b5 100644
--- 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 at https://github.com/curoverse/arvados.git'
+ connection 'scm:git at https://github.com/curoverse/arvados.git'
+ developerConnection 'scm:git at 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 at veritasgenetics.com'
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/sdk/java-v2/settings.gradle b/sdk/java-v2/settings.gradle
index be8ccc6ca..6bdaa3022 100644
--- 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 160190978..3880ddd80 100755
--- 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list