Merge pull request #27 from reTHINK-project/develop

Develop to Master

.travis.yml

@@ -21,6 +21,8 @@ before_install:
     - sudo mongo 127.0.0.1/test  --eval 'db.createCollection("wallets")'
     - sudo mongo 127.0.0.1/test  --eval 'db.createCollection("shops")'
     - sudo mongo 127.0.0.1/test  --eval 'db.createCollection("rates")'
+    - sudo mongo 127.0.0.1/test  --eval 'db.createCollection("elearnings")'
+    - sudo mongo 127.0.0.1/test  --eval 'db.createCollection("dataobjects")'
     - mvn clean
 
 test: mvn test -B

Dockerfile

@@ -8,15 +8,14 @@ RUN apt-get install -y maven
 # gpg keys listed at https://github.com/nodejs/node
 RUN set -ex \
     && for key in \
-        94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-        B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-        77984A986EBC2AA786BC0F66B01FBB92821C587A \
-        56730D5401028683275BD23C23EFEFE93C4CFFFE \
-        71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-        FD3A5288F042B6850C66B31F09FE44734EB7990E \
-        8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-        C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-        DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+          94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+          B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+          77984A986EBC2AA786BC0F66B01FBB92821C587A \
+          71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+          FD3A5288F042B6850C66B31F09FE44734EB7990E \
+          8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
+          C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+          DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
     ; do \
         gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
     done

pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -23,6 +24,14 @@
 			<version>5.0.3</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.0.3</version>
+			<scope>test</scope>
+		</dependency>
+
 
 		<dependency>
 			<groupId>io.vertx</groupId>
@@ -90,6 +99,12 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>2.9.3</version>
 		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.9</version>
+		</dependency>
 	</dependencies>
 
 	<build>