Mercurial > hg > Database > Christie

changeset 107:825e01825ad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update java11
author akahori
date Wed, 31 Oct 2018 11:04:55 +0900
parents 691017a550d0
children 31f87de2a1d4
files build.gradle src/main/java/christie/test/Paxos/ProposerCodeGear.java src/main/java/christie/topology/manager/keepalive/StartKeepAlive.java
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Sun Oct 07 12:23:31 2018 +0900
+++ b/build.gradle	Wed Oct 31 11:04:55 2018 +0900
@@ -2,8 +2,8 @@
 apply plugin: 'eclipse'
 apply plugin: 'maven'
 
-sourceCompatibility = 1.8;
-targetCompatibility = 1.8;
+sourceCompatibility = 11;
+targetCompatibility = 11;
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 group = 'cr.ie.u_ryukyu.ac.jp'
@@ -15,7 +15,7 @@
 
 dependencies {
     compile fileTree(dir: 'lib', include: '*.jar')
-    testCompile group: 'junit', name: 'junit', version: '4.21'
+    testCompile('org.junit.jupiter:junit-jupiter-api:5.2.0')
     compile group: 'org.msgpack', name: 'msgpack', version: '0.6.12'
 }
 
--- a/src/main/java/christie/test/Paxos/ProposerCodeGear.java	Sun Oct 07 12:23:31 2018 +0900
+++ b/src/main/java/christie/test/Paxos/ProposerCodeGear.java	Wed Oct 31 11:04:55 2018 +0900
@@ -14,7 +14,7 @@
     protected void run(CodeGearManager cgm) {
 
         cgm.setup(new SendPrepareRequestCodeGear());
-        put("acceptors", cgm.getRemoteDgmList());
+        //put("acceptors", cgm.getRemoteDgmList());
         put("sendProposal", new Proposal(cgm,cgm.cgmID));
         put("promiseCount", 0);
 
--- a/src/main/java/christie/topology/manager/keepalive/StartKeepAlive.java	Sun Oct 07 12:23:31 2018 +0900
+++ b/src/main/java/christie/topology/manager/keepalive/StartKeepAlive.java	Wed Oct 31 11:04:55 2018 +0900
@@ -1,11 +1,12 @@
 package christie.topology.manager.keepalive;
 
+import christie.topology.node.StartTopologyNode;
 import christie.topology.node.TopologyNode;
 import christie.topology.node.TopologyNodeConfig;
 
 public class StartKeepAlive {
     public static void main(String[] args) {
         TopologyNodeConfig conf = new TopologyNodeConfig(args);
-        new TopologyNode(conf, new KeepAlive());
+        new StartTopologyNode(conf, new KeepAlive());
     }
 }