Sync from dev (#375)

* fix contract test for group (#373)

* get ObjectMapper object from factory object instead of new it. (#371)

* release 2.1.0 update (#372)

* change abstract BlockNotifyCallBack class to interface

* place the underlying version definition in EnumNodeVersion class file.

src/test/java/org/fisco/bcos/channel/test/contract/MixContractClient.java

@@ -225,6 +225,7 @@ public static void main(String[] args) throws Exception {
         ApplicationContext context =
                 new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
         Service service = context.getBean(Service.class);
+        service.setGroupId(Integer.parseInt(args[0]));
         service.run(); // run the daemon service
         // init the client keys
         keyPair = Keys.createEcKeyPair();

src/test/java/org/fisco/bcos/channel/test/contract/OkClient.java

@@ -100,6 +100,7 @@ public static void main(String[] args) throws Exception {
         ApplicationContext context =
                 new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
         Service service = context.getBean(Service.class);
+        service.setGroupId(Integer.parseInt(args[0]));
         service.run(); // run the daemon service
         // init the client keys
         keyPair = Keys.createEcKeyPair();

src/test/java/org/fisco/bcos/channel/test/contract/TableTestClient.java

@@ -267,6 +267,7 @@ public static void main(String[] args) throws Exception {
         ApplicationContext context =
                 new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
         Service service = context.getBean(Service.class);
+        service.setGroupId(Integer.parseInt(args[0]));
         service.run(); // run the daemon service
         // init the client keys
         keyPair = Keys.createEcKeyPair();

src/test/java/org/fisco/bcos/channel/test/guomi/GMTableTestClient.java

@@ -264,6 +264,7 @@ public static void main(String[] args) throws Exception {
         ApplicationContext context =
                 new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
         Service service = context.getBean(Service.class);
+        service.setGroupId(Integer.parseInt(args[0]));
         service.run(); // run the daemon service
         // init the client keys
         keyPair = Keys.createEcKeyPair();