Merge branch 'master' of demon/esb into master

hos-admin/src/main/resources/spring/applicationContext.xml

@@ -50,7 +50,7 @@
    </bean>
    <!--Hibernate 会话管理器配置-->
    <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
        <property name="dataSource" ref="dataSource"/>
        <property name="packagesToScan">
            <list>
@@ -74,7 +74,7 @@
    </bean>
    <!-- 将多个配置文件读取到容器中，交给Spring管理 -->
    <!--Hibernate 事务配置-->
    <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
        <property name="sessionFactory" ref="sessionFactory"/>
    </bean>
    <tx:annotation-driven transaction-manager="txManager" proxy-target-class="true"/>

hos-web-framework-dependencies/pom.xml

@@ -18,6 +18,7 @@
    <properties>
        <camel.version>2.17.1</camel.version>
        <spring.version>4.3.2.RELEASE</spring.version>
        <hibernate.version>5.0.9.Final</hibernate.version>
        <!--<spring.security.version>4.0.2.RELEASE</spring.security.version>-->
    </properties>

hos-web-framework/pom.xml

@@ -14,13 +14,6 @@
        <relativePath>../hos-web-framework-dependencies</relativePath>
    </parent>
    <dependencies>
        <!-- hibernate start -->
        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-core</artifactId>
            <version>4.3.11.Final</version>
        </dependency>
        <!-- hibernate end -->
    </dependencies>