diff --git a/build.gradle b/build.gradle index 2e93358..7b3480f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { apply from: '../spotless.gradle' group = "org.bdware.sc" -version = "1.9.96" +version = "1.10.1" tasks.withType(JavaCompile) { // options.compilerArgs << '-Xlint:none' // options.compilerArgs << '-Xlint:deprecation' << "-Werror" @@ -51,8 +51,10 @@ dependencies { implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'org.bdware.bdcontract:sdk-java:1.0.2' - implementation 'org.bdware.doip:doip-audit-tool:1.4.3' - implementation 'org.bdware.doip:doip-sdk:1.5.1' + implementation 'org.bdware.doip:doip-audit-tool:1.5.1' + implementation 'org.bdware.doip:doip-sdk:1.5.5' + implementation 'org.apache.logging.log4j:log4j-layout-template-json:2.17.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3' implementation fileTree(dir: 'lib', include: '*.jar') testImplementation 'junit:junit:4.13.2' } @@ -70,8 +72,8 @@ jar { // uncomment this when publish, // while develop at local use "false" configurations.runtimeClasspath.filter { - it.getAbsolutePath().contains("/lib/") - // false + // it.getAbsolutePath().contains("/lib/") + false }.collect { it.isDirectory() ? it : zipTree(it) } diff --git a/src/main/java/org/bdware/sc/server/DoipLocalSingleton.java b/src/main/java/org/bdware/sc/server/DoipLocalSingleton.java index 1e71709..5bd652e 100644 --- a/src/main/java/org/bdware/sc/server/DoipLocalSingleton.java +++ b/src/main/java/org/bdware/sc/server/DoipLocalSingleton.java @@ -88,22 +88,20 @@ public class DoipLocalSingleton { infos.clear(); infos.add(new DoipListenerConfig(endpointInfo.getURI(), "2.1")); port = new URI(endpointInfo.getURI()).getPort(); + SharableVarManager.initSharableVarManager(repoID, config); } } DoipServiceInfo info = new DoipServiceInfo(repoID, owner, repoType, infos); server = new DoipServerImpl(info); DOOPRequestHandler handler = ContractProcess.instance.doopRequestHandler; server.setRequestCallback(handler); - if (config != null) - SharableVarManager.initSharableVarManager(info.id, config); } catch (Exception e) { e.printStackTrace(); } ResultChecker checker = new ResultChecker(); server.start(checker); checker.waitForResult(1000); - if (checker.port > 0) - return port; + if (checker.port > 0) return port; return -1; }