调整commons目录结构及POM结构

commons-admin-gateway-model/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-admin-gateway-model</artifactId>

commons-data-elasticsearch/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-elasticsearch</artifactId>

commons-data-fastdfs/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-fastdfs</artifactId>

commons-data-hbase/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-hbase</artifactId>

commons-data-mysql/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-mysql</artifactId>
@@ -34,13 +34,14 @@
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <!-- Jpa -->
        <!-- Hibernate -->
        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-validator</artifactId>
            <version>${version.hibernate-validator}</version>
        </dependency>
        <!-- Hibernate -->
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-ehr-constants</artifactId>

commons-data-query/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-query</artifactId>

commons-data-redis/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-redis</artifactId>

commons-data-solr/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-data-solr</artifactId>

commons-ehr-constants/pom.xml

@@ -5,9 +5,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-ehr-constants</artifactId>

commons-entity/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-entity</artifactId>

commons-metrics/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-metrics</artifactId>

commons-profile-core/pom.xml

@@ -5,9 +5,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-profile-core</artifactId>

commons-redis-mq/pom.xml

@@ -5,9 +5,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-redis-mq</artifactId>

commons-rest-model/pom.xml

@@ -4,9 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-rest-model</artifactId>

commons-ui-swagger/dependency-reduced-pom.xml

@@ -1,39 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
  <parent>
    <artifactId>ehr-lib-parent</artifactId>
    <groupId>com.yihu.ehr</groupId>
    <version>1.2.0</version>
    <relativePath>../ehr-lib-parent/pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>commons-ui-swagger</artifactId>
  <build>
    <plugins>
      <plugin>
        <artifactId>maven-shade-plugin</artifactId>
        <version>2.4.1</version>
        <executions>
          <execution>
            <phase>package</phase>
            <goals>
              <goal>shade</goal>
            </goals>
            <configuration>
              <relocations>
                <relocation>
                  <pattern>com.google.guava</pattern>
                  <shadedPattern>shaded.com.google.guava</shadedPattern>
                </relocation>
              </relocations>
              <transformers>
                <transformer />
              </transformers>
            </configuration>
          </execution>
        </executions>
      </plugin>
    </plugins>
  </build>
<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/maven-v4_0_0.xsd">
    <parent>
        <artifactId>ehr-cloud-parent</artifactId>
        <groupId>com.yihu.ehr</groupId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>commons-ui-swagger</artifactId>
    <build>
        <plugins>
            <plugin>
                <artifactId>maven-shade-plugin</artifactId>
                <version>2.4.1</version>
                <executions>
                    <execution>
                        <phase>package</phase>
                        <goals>
                            <goal>shade</goal>
                        </goals>
                        <configuration>
                            <relocations>
                                <relocation>
                                    <pattern>com.google.guava</pattern>
                                    <shadedPattern>shaded.com.google.guava</shadedPattern>
                                </relocation>
                            </relocations>
                            <transformers>
                                <transformer/>
                            </transformers>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
</project>

commons-ui-swagger/pom.xml

@@ -5,9 +5,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-ui-swagger</artifactId>
@@ -26,24 +26,8 @@
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-core</artifactId>
            <version>2.7.0</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-spi</artifactId>
            <version>2.7.0</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-spring-web</artifactId>
            <version>2.7.0</version>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>

commons-util/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-util</artifactId>

commons-web/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>../ehr-cloud/pom.xml</relativePath>
        <relativePath>../ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    <artifactId>commons-web</artifactId>

ehr-cloud/pom.xml

@@ -4,10 +4,10 @@
         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>
    <groupId>com.yihu.ehr</groupId>
    <artifactId>ehr-cloud</artifactId>
    <artifactId>ehr-cloud-parent</artifactId>
    <version>1.13.1</version>
    <packaging>pom</packaging>
    <name>ehr-cloud</name>
    <name>ehr-cloud-parent</name>
    <description>EHR parent pom for all</description>
    <url>http://ehr.yihu.com</url>
@@ -93,9 +93,6 @@
        <version.spring-data-jpa>1.11.10.RELEASE</version.spring-data-jpa>
        <version.spring-kafka>1.0.5.RELEASE</version.spring-kafka>
        <version.springfox>2.7.0</version.springfox>
        <version.commons-bean-utils>1.9.2</version.commons-bean-utils>
        <version.commons-codec>1.9</version.commons-codec>
        <version.commons-collections>3.2.1</version.commons-collections>
@@ -109,12 +106,6 @@
        <version.hadoop-client>2.6.5</version.hadoop-client>
        <version.hbase-client>1.1.1</version.hbase-client>
        <version.solr>5.5.4</version.solr>
        <version.hibernate>4.3.11.Final</version.hibernate>
        <version.hibernate-validator>6.0.10.Final</version.hibernate-validator>
        <version.hibernate-jpa-api>1.0.0.Final</version.hibernate-jpa-api>
        <version.http-core>4.4.3</version.http-core>
        <version.http-client>4.5.1</version.http-client>
        <version.http-mime>4.5.1</version.http-mime>
        <version.io-dropwizard-metrics>3.1.2</version.io-dropwizard-metrics>
        <version.jackson>2.6.6</version.jackson>
        <version.jedis>2.9.0</version.jedis>
@@ -133,7 +124,6 @@
        <version.slf4j>1.7.21</version.slf4j>
        <version.statsd-client>3.1.0</version.statsd-client>
        <version.swagger>2.7.0</version.swagger>
        <version.swagger-ui>2.7.0</version.swagger-ui>
        <version.thrift>0.9.1</version.thrift>
        <version.tomcat-embed>8.5.27</version.tomcat-embed>
        <version.websocket-api>1.1</version.websocket-api>
@@ -199,25 +189,6 @@
                <version>${version.spring-data-solr}</version>
            </dependency>
            <!--spring fox-->
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-core</artifactId>
                <version>${version.springfox}</version>
            </dependency>
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-spi</artifactId>
                <version>${version.springfox}</version>
            </dependency>
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-spring-web</artifactId>
                <version>${version.springfox}</version>
            </dependency>
            <!--Apache commons library -->
            <dependency>
                <groupId>org.codehaus.woodstox</groupId>
@@ -292,28 +263,6 @@
                <version>${version.mysql}</version>
            </dependency>
            <!-- Hibernate framework library -->
            <dependency>
                <groupId>org.hibernate</groupId>
                <artifactId>hibernate-core</artifactId>
                <version>${version.hibernate}</version>
            </dependency>
            <dependency>
                <groupId>org.hibernate</groupId>
                <artifactId>hibernate-validator</artifactId>
                <version>${version.hibernate-validator}</version>
            </dependency>
            <dependency>
                <groupId>org.hibernate</groupId>
                <artifactId>hibernate-entitymanager</artifactId>
                <version>${version.hibernate}</version>
            </dependency>
            <dependency>
                <groupId>org.hibernate.javax.persistence</groupId>
                <artifactId>hibernate-jpa-2.1-api</artifactId>
                <version>${version.hibernate-jpa-api}</version>
            </dependency>
            <!-- Zookeeper library -->
            <dependency>
                <groupId>org.apache.zookeeper</groupId>
@@ -534,6 +483,7 @@
            <dependency>
                <groupId>org.quartz-scheduler</groupId>
                <artifactId>quartz-jobs</artifactId>
                <version>${version.quartz}</version>
            </dependency>
            <!-- Zip library -->
@@ -559,7 +509,7 @@
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-swagger-ui</artifactId>
                <version>${version.swagger-ui}</version>
                <version>${version.swagger}</version>
            </dependency>
            <!-- date Time util library -->
@@ -737,7 +687,7 @@
            <dependency>
                <groupId>com.yihu.ehr</groupId>
                <artifactId>commons-web</artifactId>
                <version>1.2.0</version>
                <version>${version.ehr}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.hos</groupId>
@@ -870,7 +820,7 @@
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <version>${spring-boot-version}</version>
                    <version>${version.spring-boot}</version>
                    <executions>
                        <execution>
                            <goals>
@@ -883,7 +833,7 @@
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin-ext</artifactId>
                    <version>${spring-boot-version}</version>
                    <version>${version.spring-boot}</version>
                    <executions>
                        <execution>
                            <goals>

pom.xml

@@ -5,11 +5,11 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.ehr</groupId>
        <artifactId>ehr-cloud</artifactId>
        <artifactId>ehr-cloud-parent</artifactId>
        <version>1.13.1</version>
        <relativePath>./ehr-cloud/pom.xml</relativePath>
        <relativePath>./ehr-cloud-parent/pom.xml</relativePath>
    </parent>
    
    <artifactId>commons</artifactId>
    <version>1.13.1</version>
    <packaging>pom</packaging>