0.28.0 (#49)

Path concat fix.
Fix NPE in DSLink.shutdown().
Set up push and release to maven central
Make gradlew runnable. Add gradle.properties with defaults for ossrhUsername and ossrhPassword
AES 256
SHA 256
Lenient salt update
Fix lenient handling of salt.
Fix leading byte in binary output debugging.
AES128 & SHA-1
Fix subscription responder.
Repo changes.

Author: a-hansen

.gitignore

@@ -1,31 +1,34 @@
 # Tooling
-**/.classpath
-**/.idea
-**/.metadata
-**/.project
-**/.settings
-**/eclipseBin
+**.classpath
+**.idea
+**.metadata
+**.project
+**.settings
+**eclipseBin
 
 # Build artifacts
 **.class
 **.iml
+**build
+**classes
+**libJar
+**out
+**target
 **/.gradle
-**/build
-**/out
-**/libJar
-**/target
+**javadoc
+**repository
 
 # Misc
 **.bak
 **.old
 **.log
-**/.DS_Store
+**.DS_Store
 
 # Runtime files
-**/dslink.jks
-**/.key
-**/db
-**/nodes.json
-**/nodes*.zip
-**/test.json
+**.jks
+**.key
+**db
+**nodes.json
+**nodes*.zip
+**test.json
 **/*.log.*.zip

README.md

@@ -15,9 +15,9 @@ the DSA architecture, please visit
 
 ## Sub Projects
 
-  - **/dslink-core** - The APIs used to build new links.
-  - **/dslink-java-v2-poc** - For proof of concept and testing.
-  - **/dslink-websocket-standalone** - Used by links that run in their own process, rather
+  - **/dslink-v2** - The APIs used to build new links.
+  - **/dslink-v2-poc** - For proof of concept and testing.
+  - **/dslink-v2-websocket** - Used by links that run in their own process, rather
     than in an environment which provides another websocket implementation.
 
 ## Link Development

build.gradle

@@ -7,48 +7,33 @@ buildscript {
     }
 }
 
-apply plugin: 'nexus-workflow'
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'signing'
+subprojects {
 
-group 'org.iot-dsa'
-version '0.27.0'
+    apply plugin: 'java'
+    apply plugin: 'maven'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+    group 'org.iot-dsa'
+    version '0.28.0'
 
-install {
-    repositories.mavenInstaller {
-        pom.project {
-            artifactId 'dslink-v2'
+    sourceCompatibility = 1.6
+    targetCompatibility = 1.6
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
     }
-}
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots/'
+    task sourcesJar(group: 'build', type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allJava
     }
-}
 
-dependencies {
-    testCompile 'junit:junit:[4.12,)'
-}
-
-task sourcesJar(group: 'build', type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allJava
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
 
-artifacts {
-    archives sourcesJar
-    archives javadocJar
 }

dslink-java-v2-poc/README.md renamed to dslink-v2-poc/README.md

@@ -3,7 +3,7 @@ apply plugin: 'application'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
-group 'org.iot.dsa'
+group 'org.iot-dsa'
 mainClassName = 'org.iot.dsa.dslink.DSLink'
 
 applicationDefaultJvmArgs = [
@@ -12,15 +12,11 @@ applicationDefaultJvmArgs = [
 repositories {
     mavenLocal()
     mavenCentral()
-    maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots/'
-    }
 }
 
 dependencies {
-    compile project(':dslink-core')
-    compile project(':dslink-websocket-standalone')
-    testCompile 'junit:junit:+'
+    compile project(':dslink-v2')
+    compile project(':dslink-v2-websocket')
 }
 
 applicationDistribution.from(new File(project.projectDir, "/dslink.json"))

dslink-java-v2-poc/build.gradle renamed to dslink-v2-poc/build.gradle

@@ -1,8 +1,13 @@
-apply from: '../build.gradle'
+apply plugin: 'nexus-workflow'
+apply plugin: 'signing'
+
+artifacts {
+    archives sourcesJar
+}
 
 dependencies {
-    compile project(':dslink-core')
-    compile 'org.glassfish.tyrus.bundles:tyrus-standalone-client:[1.12,)'
+    compile project(':dslink-v2')
+    compile 'org.glassfish.tyrus.bundles:tyrus-standalone-client:[1.13.1,)'
 }
 
 signing {
@@ -24,9 +29,9 @@ uploadArchives {
             }
 
             pom.project {
-                name = 'DSLink SDK V2 Websocket Implementation'
-                artifactId = 'dslink-websocket-standalone-v2'
-                description = 'V2 Implementation of Websockets for IoT DSA protocol'
+                name = 'V2 DSLink SDK Websockets'
+                artifactId = 'dslink-v2-websocket'
+                description = 'Default Implementation of Websockets for V2 DSLink SDK'
 
                 packaging = 'jar'
                 url = 'http://iot-dsa.org'
@@ -43,14 +48,6 @@ uploadArchives {
                         url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
-
-                developers {
-                    developer {
-                        id = 'samrg472'
-                        name = 'Samuel Grenier'
-                        email = '[email protected]'
-                    }
-                }
             }
         }
     }

dslink-java-v2-poc/dslink.json renamed to dslink-v2-poc/dslink.json

@@ -1,4 +1,14 @@
-apply from: '../build.gradle'
+apply plugin: 'nexus-workflow'
+apply plugin: 'signing'
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+dependencies {
+    testCompile 'junit:junit:[4.12,)'
+}
 
 javadoc {
     exclude("**/com/**")
@@ -23,9 +33,9 @@ uploadArchives {
             }
 
             pom.project {
-                name = 'DSLink SDK V2'
-                artifactId = 'dslink-core-v2'
-                description = 'V2 Java SDK for the IoT DSA protocol'
+                name = 'V2 DSLink SDK'
+                artifactId = 'dslink-v2'
+                description = 'V2 DSLink SDK for IoT DSA'
 
                 packaging = 'jar'
                 url = 'http://iot-dsa.org'
@@ -42,14 +52,6 @@ uploadArchives {
                         url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
-
-                developers {
-                    developer {
-                        id = 'samrg472'
-                        name = 'Samuel Grenier'
-                        email = '[email protected]'
-                    }
-                }
             }
         }
     }