Merge pull request #12 from openconnectivity/develop

Merge develop into master

README.md

@@ -46,7 +46,7 @@ mvn install:install-file \
     -DgeneratePom=true
 ```
 
-6. Add the following command, to link the previous libraries with iotivity.jar, in the run/debug configuration:
+To run or to debug the OTGC application in an IDE, the following command as to be added as VM argument to link iotivity-lite library to the project:
 ```
 -Djava.library.path=<otgc-linux>/lib/jni
 ```

build/debian/otgc_native.sh

@@ -11,7 +11,7 @@
 
 # Constants
 PROJECT_NAME="otgc"
-VERSION="2.2.0"
+VERSION="2.3.0"
 
 program=$0
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>otgc</groupId>
     <artifactId>otgc</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/openconnectivity/otgc/domain/usecase/InitOicStackUseCase.java

@@ -89,18 +89,12 @@ private void factoryResetHandler(long device) throws Exception {
         if (OCPki.addMfgTrustAnchor(device, kyrioRootcaCertificate) == -1) {
             throw new Exception("Add root certificate error");
         }
-        if (OCPki.addTrustAnchor(device, kyrioRootcaCertificate) == -1) {
-            throw new Exception("Add root certificate error");
-        }
 
         /* EonTi root cert */
         byte[] eontiRootcaCertificate = ioRepository.getBytesFromFile(OtgcConstant.EONTI_ROOT_CERTIFICATE).blockingGet();
         if (OCPki.addMfgTrustAnchor(device, eontiRootcaCertificate) == -1) {
             throw new Exception("Add root certificate error");
         }
-        if (OCPki.addTrustAnchor(device, eontiRootcaCertificate) == -1) {
-            throw new Exception("Add root certificate error");
-        }
 
         OCObt.shutdown();
     }