Merge pull request #135 from RADAR-base/release-0.3.5

Release 0.3.5

commons/active/notification/notification.avsc

@@ -15,6 +15,7 @@
         "type": "record",
         "doc": "Notification answer.",
          "fields": [
+           { "name": "questionId", "type": ["null", "string"], "doc": "Unique identifier for the specific question.", "default": null },
            { "name": "value", "type": ["int", "string", "double"], "doc": "Subject answer." },
            { "name": "startTime", "type": "double", "doc": "Timestamp in UTC (s) when the notification is shown." },
            { "name": "endTime", "type": "double", "doc": "Timestamp in UTC (s)  when the notification is answered." }

commons/active/task/task.avsc

@@ -15,6 +15,7 @@
         "type": "record",
         "doc": "Task answer.",
          "fields": [
+           { "name": "questionId", "type": ["null", "string"], "doc": "Unique identifier for the specific question.", "default": null },
            { "name": "value", "type": ["int", "string", "double"], "doc": "Subject answer." },
            { "name": "startTime", "type": "double", "doc": "Timestamp in UTC (s) when the task is shown." },
            { "name": "endTime", "type": "double", "doc": "Timestamp in UTC (s)  when the task is answered." }

java-sdk/README.md

@@ -9,13 +9,13 @@ repositories {
 
 dependencies {
     // Commons schemas (backend, passive remote monitoring app)
-    compile 'org.radarcns:radar-schemas-commons:0.3.4'
+    compile 'org.radarcns:radar-schemas-commons:0.3.5'
 
     // REST API schemas (REST API, testing)
-    compile 'org.radarcns:radar-schemas-restapi:0.3.4'
+    compile 'org.radarcns:radar-schemas-restapi:0.3.5'
 
     // Questionnaire schemas (active remote monitoring app)
-    compile 'org.radarcns:radar-schemas-tools:0.3.4'
+    compile 'org.radarcns:radar-schemas-tools:0.3.5'
 }
 ```
 Usually, you only need to include the schemas you actually need in your dependencies.

java-sdk/build.gradle

@@ -4,8 +4,8 @@
 
 plugins {
     id 'com.commercehub.gradle.plugin.avro-base' version '0.9.0'
-    id 'com.jfrog.bintray' version '1.7.3'
-    id 'com.jfrog.artifactory' version '4.4.18'
+    id 'com.jfrog.bintray' version '1.8.1'
+    id 'com.jfrog.artifactory' version '4.7.5'
 }
 
 subprojects {
@@ -17,9 +17,9 @@ subprojects {
     apply plugin: 'idea'
 
     // Configuration
-    version = '0.3.4'
+    version = '0.3.5'
     group = 'org.radarcns'
-    ext.githubRepoName = 'RADAR-CNS/RADAR-Schemas'
+    ext.githubRepoName = 'RADAR-base/RADAR-Schemas'
 
     targetCompatibility = '1.7'
     sourceCompatibility = '1.7'
@@ -144,6 +144,6 @@ subprojects {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion '4.4'
+wrapper {
+    gradleVersion '4.9'
 }

java-sdk/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

java-sdk/radar-schemas-commons/build.gradle

@@ -38,9 +38,7 @@ publishing {
             from components.java
             artifact sourcesJar
             artifact javadocJar
-            groupId project.group
             artifactId artifactName
-            version project.version
             pom.withXml {
                 def root = asNode()
                 root.appendNode('description', description)
@@ -53,10 +51,10 @@ publishing {
 }
 
 bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-    override = false
-    publications = ['RadarCommonsPublication']
+    user project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
+    key project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+    override false
+    publications 'RadarCommonsPublication'
     pkg {
         repo = project.group
         name = artifactName

java-sdk/radar-schemas-tools/build.gradle

@@ -6,9 +6,6 @@ plugins {
     id 'com.jfrog.artifactory'
 }
 
-ext.artifactName = 'radar-schemas-tools'
-ext.description = 'RADAR Schemas specification and validation tools.'
-
 targetCompatibility = '1.8'
 sourceCompatibility = '1.8'
 mainClassName = 'org.radarcns.schema.CommandLineApp'
@@ -20,19 +17,29 @@ sourceSets {
     }
 }
 
-ext.junitVersion = '4.12'
-ext.slf4jVersion = '1.7.25'
-ext.jettyVersion = '9.4.8.v20171121'
-ext.jerseyVersion = '2.26'
+ext {
+    artifactName = 'radar-schemas-tools'
+    description = 'RADAR Schemas specification and validation tools.'
+
+    argparseVersion = '0.8.1'
+    jacksonVersion = '2.9.6'
+    jerseyVersion = '2.27'
+    jettyVersion = '9.4.11.v20180605'
+    junitVersion = '4.12'
+    kafkaVersion = '2.0.0'
+    radarCommonsVersion = '0.9.0'
+    slf4jVersion = '1.7.25'
+}
 
 dependencies {
-    api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.10'
+    api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
     api group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final'
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.8.10'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jacksonVersion
     implementation project(':radar-schemas-commons')
-    implementation group: 'org.radarcns', name: 'radar-commons', version: '0.6-alpha.1'
-    implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.7.0'
-    implementation (group: 'org.apache.kafka', name: 'kafka_2.11', version: '0.11.0.1') {
+    implementation group: 'org.radarcns', name: 'radar-commons', version: radarCommonsVersion
+    implementation group: 'org.radarcns', name: 'radar-commons-server', version: radarCommonsVersion
+    implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparseVersion
+    implementation (group: 'org.apache.kafka', name: 'kafka_2.12', version: kafkaVersion) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
     implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: jettyVersion
@@ -43,7 +50,7 @@ dependencies {
     api group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet-core', version: jerseyVersion
 
     runtimeOnly group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVersion
-    runtimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+    runtimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion
     runtimeOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jerseyVersion 
 
     testCompile group: 'junit', name: 'junit', version: junitVersion
@@ -77,7 +84,7 @@ checkstyle {
     toolVersion '6.16'
     ignoreFailures false
 
-    configFile = file("$projectDir/config/checkstyle/checkstyle.xml")
+    configFile = file("$rootDir/config/checkstyle/checkstyle.xml")
 }
 
 pmd {
@@ -89,7 +96,7 @@ pmd {
 
     ruleSets = []
 
-    ruleSetFiles = files("$projectDir/config/pmd/ruleset.xml")
+    ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
 }
 
 
@@ -104,13 +111,11 @@ tasks.withType(Tar){
 
 publishing {
     publications {
-        RadarCommonsPublication(MavenPublication) {
+        RadarToolsPublication(MavenPublication) {
             from components.java
             artifact sourcesJar
             artifact javadocJar
-            groupId project.group
             artifactId artifactName
-            version project.version
             pom.withXml {
                 def root = asNode()
                 root.appendNode('description', description)
@@ -128,10 +133,10 @@ publishing {
 }
 
 bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-    override = false
-    publications = ['RadarCommonsPublication']
+    user project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
+    key project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+    override false
+    publications 'RadarToolsPublication'
     pkg {
         repo = project.group
         name = artifactName
@@ -164,5 +169,5 @@ artifactory {
 }
 
 artifactoryPublish {
-    publications('RadarCommonsPublication')
+    publications('RadarToolsPublication')
 }

java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/CommandLineApp.java

@@ -208,8 +208,9 @@ public static void main(String... args) {
     }
 
     private static ArgumentParser getArgumentParser(SortedMap<String, SubCommand> subCommands) {
-        ArgumentParser parser = ArgumentParsers.newArgumentParser("radar-schema")
-                .defaultHelp(true)
+        ArgumentParser parser = ArgumentParsers.newFor("radar-schema")
+                .addHelp(true)
+                .build()
                 .description("Schema tools");
 
         Subparsers subParsers = parser.addSubparsers().dest("subparser");