diff --git a/build.gradle b/build.gradle index d59edfad..35cc45ac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,10 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.adaptc.gradle:nexus-workflow:0.6' - } -} - subprojects { apply plugin: 'java' apply plugin: 'maven' group 'org.iot-dsa' - version '0.28.0' + version '0.29.0' sourceCompatibility = 1.6 targetCompatibility = 1.6 @@ -21,9 +12,6 @@ subprojects { repositories { mavenLocal() mavenCentral() - maven { - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } } task sourcesJar(group: 'build', type: Jar, dependsOn: classes) { @@ -35,5 +23,8 @@ subprojects { classifier = 'javadoc' from javadoc.destinationDir } +} +task wrapper(type: Wrapper) { + gradleVersion = '4.8.1' } diff --git a/dslink-v2-poc/build.gradle b/dslink-v2-poc/build.gradle index e887cb7b..2c35b165 100644 --- a/dslink-v2-poc/build.gradle +++ b/dslink-v2-poc/build.gradle @@ -15,8 +15,8 @@ repositories { } dependencies { - compile project(':dslink-v2') - compile project(':dslink-v2-websocket') + implementation project(':dslink-v2') + implementation project(':dslink-v2-websocket') } applicationDistribution.from(new File(project.projectDir, "/dslink.json")) diff --git a/dslink-v2-websocket/build.gradle b/dslink-v2-websocket/build.gradle index 57b52b4f..e63d27be 100644 --- a/dslink-v2-websocket/build.gradle +++ b/dslink-v2-websocket/build.gradle @@ -1,54 +1,8 @@ -apply plugin: 'nexus-workflow' -apply plugin: 'signing' - artifacts { archives sourcesJar } dependencies { - compile project(':dslink-v2') - compile 'org.glassfish.tyrus.bundles:tyrus-standalone-client:[1.13.1,)' -} - -signing { - required { gradle.taskGraph.hasTask("uploadArchives") } - 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 = 'V2 DSLink SDK Websockets' - artifactId = 'dslink-v2-websocket' - description = 'Default Implementation of Websockets for V2 DSLink SDK' - - packaging = 'jar' - url = 'http://iot-dsa.org' - - scm { - connection = 'scm:git:https://github.com/iot-dsa-v2/sdk-dslink-java-v2.git' - developerConnection = 'scm:git:git@github.com:iot-dsa-v2/sdk-dslink-java-v2.git' - url = 'https://github.com/iot-dsa-v2/sdk-dslink-java-v2' - } - - licenses { - license { - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - } - } - } + implementation project(':dslink-v2') + implementation 'org.glassfish.tyrus.bundles:tyrus-standalone-client:[1.13.1,)' } diff --git a/dslink-v2/build.gradle b/dslink-v2/build.gradle index d124ff1d..07a12bc1 100644 --- a/dslink-v2/build.gradle +++ b/dslink-v2/build.gradle @@ -1,58 +1,12 @@ -apply plugin: 'nexus-workflow' -apply plugin: 'signing' - artifacts { archives sourcesJar archives javadocJar } dependencies { - testCompile 'junit:junit:[4.12,)' + testImplementation 'junit:junit:[4.12,)' } javadoc { exclude("**/com/**") } - -signing { - required { gradle.taskGraph.hasTask("uploadArchives") } - 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 = 'V2 DSLink SDK' - artifactId = 'dslink-v2' - description = 'V2 DSLink SDK for IoT DSA' - - packaging = 'jar' - url = 'http://iot-dsa.org' - - scm { - connection = 'scm:git:https://github.com/iot-dsa-v2/sdk-dslink-java-v2.git' - developerConnection = 'scm:git:git@github.com:iot-dsa-v2/sdk-dslink-java-v2.git' - url = 'https://github.com/iot-dsa-v2/sdk-dslink-java-v2' - } - - licenses { - license { - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - } - } - } -} diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/SysCertManager.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/SysCertManager.java index 29148606..657cea24 100644 --- a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/SysCertManager.java +++ b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/SysCertManager.java @@ -5,7 +5,7 @@ import org.iot.dsa.node.DSInfo; import org.iot.dsa.node.DSNode; import org.iot.dsa.node.DSString; -import org.iot.dsa.security.DSPasswordAes256; +import org.iot.dsa.security.DSPasswordAes128; /** * Certificate management for the whole process. This is basically a stub for future @@ -57,11 +57,11 @@ public void declareDefaults() { declareDefault(ALLOW_SERVERS, DSBool.TRUE); declareDefault(CERTFILE, DSString.valueOf("dslink.jks")); declareDefault(CERTFILE_TYPE, DSString.valueOf("JKS")); - declareDefault(CERTFILE_PASS, DSPasswordAes256.valueOf("dsarocks")); + declareDefault(CERTFILE_PASS, DSPasswordAes128.valueOf("dsarocks")); } private String getCertFilePass() { - DSPasswordAes256 pass = (DSPasswordAes256) keystorePass.getObject(); + DSPasswordAes128 pass = (DSPasswordAes128) keystorePass.getObject(); return pass.decode(); } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..758de960 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ