Merge pull request #179 from assimbly/develop

Develop
assimbly · Dec 21, 2018 · 0e8adf4 · 0e8adf4
2 parents f332c34 + 09c59f6
commit 0e8adf4
Show file tree

Hide file tree

Showing 12 changed files with 1,973 additions and 1,631 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-Assimbly is a messaging gateway. It has the folloingw characteristics:
+Assimbly is a messaging gateway. It has the following characteristics:
 
 1. it's a link between endpoints, allow them to share information and bypass certain protocols.
 2. it's a point of accesss (a portal).

diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ dependencyManagement {
 defaultTasks 'bootRun'
 
 group = 'org.assimbly.gateway'
-version = '1.1.0'
+version = '1.2.0'
 
 description = ''
 
@@ -204,12 +204,12 @@ dependencies {
 
 	// custom dependencies (non-jhipster)
     compile "org.assimbly:connector:1.0.0"
+    compile "io.github.assimbly:docconverter:1.1.0"	
 	compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.5"
 	compile "org.jdom:jdom2:2.0.6"
 	compile "org.springframework:spring-websocket:4.3.20.RELEASE"
 	compile "org.springframework.security:spring-security-messaging:4.2.3.RELEASE"
 
-
 	// end custom dependencies
 
     testCompile "com.jayway.jsonpath:json-path"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gateway",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A message gateway based on Apache camel",
   "private": true,
   "license": "Apache License 2.0",

diff --git a/src/main/java/org/assimbly/gateway/config/environment/ConvertUtil.java b/src/main/java/org/assimbly/gateway/config/environment/ConvertUtil.java