Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
43 changes: 43 additions & 0 deletions sdk-abi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}
42 changes: 42 additions & 0 deletions sdk-amop/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}
51 changes: 44 additions & 7 deletions sdk-codegen/build.gradle
Original file line number Diff line number Diff line change
@@ -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}")
}
}

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'
}
}
}
}
}
}
42 changes: 42 additions & 0 deletions sdk-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}
18 changes: 11 additions & 7 deletions sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,17 @@ public List<String> 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) {
Expand Down
43 changes: 43 additions & 0 deletions sdk-crypto/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}
44 changes: 44 additions & 0 deletions sdk-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}

42 changes: 42 additions & 0 deletions sdk-transaction/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}
}