Merge branch 'master' of http://192.168.1.220:10080/EHR/commons

ehr-cloud-parent/pom.xml

@@ -156,8 +156,10 @@
        <zbus-version>0.11.5</zbus-version>
        <jolokia-version>1.3.5</jolokia-version>
        <spring-securit-version>4.2.3.RELEASE</spring-securit-version>
        <spring-mongodb-version>1.4.5.RELEASE</spring-mongodb-version>
        <hos-version>1.3.0</hos-version>
        <hos-web-framework>${hos-version}</hos-web-framework>
        <mongo.version>3.2.2</mongo.version>
    </properties>
    <dependencyManagement>
@@ -809,17 +811,41 @@
                <artifactId>spring-security-crypto</artifactId>
                <version>${spring-securit-version}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-data-mongodb</artifactId>
                <version>${spring-mongodb-version}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.ehr</groupId>
                <artifactId>hos-web-framework</artifactId>
                <version>${hos-version}</version>
            </dependency>
          
          	<dependency>
                <groupId>io.netty</groupId>
                <artifactId>netty-all</artifactId>
                <version>${version.netty}</version>
            </dependency>
            <dependency>
                <groupId>org.mongodb</groupId>
                <artifactId>mongo-java-driver</artifactId>
                <version>${mongo.version}</version>
            </dependency>
            <dependency>
                <groupId>org.mongodb</groupId>
                <artifactId>mongodb-driver-core</artifactId>
                <version>${mongo.version}</version>
            </dependency>
            <dependency>
                <groupId>org.mongodb</groupId>
                <artifactId>mongodb-driver</artifactId>
                <version>${mongo.version}</version>
            </dependency>
            <dependency>
                <groupId>org.mongodb</groupId>
                <artifactId>bson</artifactId>
                <version>${mongo.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>