diff --git a/build.gradle b/build.gradle index a4571bb32..ab2b2849a 100644 --- a/build.gradle +++ b/build.gradle @@ -37,15 +37,15 @@ ext { // check.dependsOn integrationTest // integrationTest.mustRunAfter test allprojects { - group = 'org.fisco-bcos' + group = 'org.fisco-bcos.java-sdk' version = '1.0.0-SNAPSHOT' apply plugin: 'maven' apply plugin: 'maven-publish' - apply plugin: 'signing' apply plugin: 'idea' apply plugin: 'eclipse' apply plugin: 'java' apply plugin: 'jacoco' + apply plugin: 'signing' configurations.all { resolutionStrategy.cacheChangingModulesFor 30, 'seconds' diff --git a/sdk-abi/build.gradle b/sdk-abi/build.gradle index f976a9657..f6c20be3b 100644 --- a/sdk-abi/build.gradle +++ b/sdk-abi/build.gradle @@ -6,3 +6,46 @@ dependencies { compile project(':sdk-crypto') compile ("org.apache.commons:commons-lang3:${commonsLang3Version}") } + +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} diff --git a/sdk-amop/build.gradle b/sdk-amop/build.gradle index 7408e3c3e..fabecace9 100644 --- a/sdk-amop/build.gradle +++ b/sdk-amop/build.gradle @@ -7,3 +7,45 @@ dependencies { compile project(':sdk-crypto') compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") } +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} diff --git a/sdk-codegen/build.gradle b/sdk-codegen/build.gradle index d0f851983..73962b2b6 100644 --- a/sdk-codegen/build.gradle +++ b/sdk-codegen/build.gradle @@ -1,16 +1,53 @@ // Apply the java-library plugin to add support for Java Library plugins { - id 'maven' - id 'maven-publish' - id 'signing' - id 'idea' - id 'eclipse' id 'java' - id 'jacoco' } dependencies { compile project(':sdk-transaction') compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") compile ("com.squareup:javapoet:${javapoetVersion}") compile ("info.picocli:picocli:${picocliVersion}") -} \ No newline at end of file +} + +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} diff --git a/sdk-core/build.gradle b/sdk-core/build.gradle index 42583d5f5..2d77a2885 100644 --- a/sdk-core/build.gradle +++ b/sdk-core/build.gradle @@ -9,3 +9,45 @@ dependencies { compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") compile ("com.moandjiezana.toml:toml4j:${toml4jVersion}") } +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java index e78756282..57a709447 100644 --- a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java +++ b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java @@ -356,13 +356,17 @@ public List getAvailablePeer() { } private void broadcastHeartbeat() { - msgHandler - .getAvailablePeer() - .forEach( - (peer, ctx) -> { - sendHeartbeatMessage(ctx); - logger.trace("broadcastHeartbeat to {} success ", peer); - }); + try { + msgHandler + .getAvailablePeer() + .forEach( + (peer, ctx) -> { + sendHeartbeatMessage(ctx); + logger.trace("broadcastHeartbeat to {} success ", peer); + }); + } catch (Exception e) { + logger.error("broadcastHeartbeat failed, error info: {}", e.getMessage()); + } } public void sendHeartbeatMessage(ChannelHandlerContext ctx) { diff --git a/sdk-crypto/build.gradle b/sdk-crypto/build.gradle index f2907ebdb..8d0c26c59 100644 --- a/sdk-crypto/build.gradle +++ b/sdk-crypto/build.gradle @@ -7,3 +7,46 @@ dependencies { compile ("org.bouncycastle:bcprov-jdk15on:${bcprovJDK15onVersion}") compile ("com.webank:key-mini-toolkit:${keyMiniToolkit}") } + +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} diff --git a/sdk-service/build.gradle b/sdk-service/build.gradle index 40a3416be..34bcf561e 100644 --- a/sdk-service/build.gradle +++ b/sdk-service/build.gradle @@ -7,3 +7,47 @@ dependencies { compile project(':sdk-abi') compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") } + +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +} + diff --git a/sdk-transaction/build.gradle b/sdk-transaction/build.gradle index 71754d435..6a7a0b186 100644 --- a/sdk-transaction/build.gradle +++ b/sdk-transaction/build.gradle @@ -8,3 +8,45 @@ dependencies { compile ("commons-io:commons-io:${commonsIOVersion}") compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") } +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 project.name + packaging 'jar' + description = 'fisco-bcos java-sdk' + url = 'http://www.fisco-bcos.org' + + scm { + connection = 'https://github.com/FISCO-BCOS/java-sdk.git' + url = 'https://github.com/FISCO-BCOS/java-sdk.git' + } + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'zhangsan' + name = 'zhangsan' + email = 'zhangsan@example.com' + } + } + } + } + } +}