Commit 0628aec5 authored by dailidong's avatar dailidong Committed by Tboy
Browse files

regularize api module pom.xml and rpc module compile to 1.8 (#1733) 



* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

Co-authored-by: default avatarDS <escheduler@outlook.com>
parent 15ae4dfa

dolphinscheduler-api/pom.xml

+62 −34
Original line number Diff line number Diff line
@@ -27,11 +27,19 @@ 
  <name>${project.artifactId}</name>

  <packaging>jar</packaging>



  <properties>

    <jasper-runtime.version>5.5.23</jasper-runtime.version>

    <servlet-api.version>2.5</servlet-api.version>

    <swagger.version>1.9.3</swagger.version>

    <springfox.version>2.9.2</springfox.version>

  </properties>



  <dependencies>

    <dependency>

      <groupId>org.apache.dolphinscheduler</groupId>

      <artifactId>dolphinscheduler-alert</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.dolphinscheduler</groupId>

      <artifactId>dolphinscheduler-server</artifactId>
@@ -91,25 +99,8 @@ 
      </exclusions>

    </dependency>



    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-test</artifactId>

      <scope>test</scope>

      <exclusions>

        <exclusion>

          <groupId>org.ow2.asm</groupId>

          <artifactId>asm</artifactId>

        </exclusion>

        <exclusion>

          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot</artifactId>

        </exclusion>

        <exclusion>

          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot-autoconfigure</artifactId>

        </exclusion>

      </exclusions>

    </dependency>





    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-aop</artifactId>
@@ -120,6 +111,7 @@ 
        </exclusion>

      </exclusions>

    </dependency>



    <dependency>

      <groupId>org.springframework</groupId>

      <artifactId>spring-context</artifactId>
@@ -129,6 +121,7 @@ 
      <groupId>org.apache.httpcomponents</groupId>

      <artifactId>httpcore</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.httpcomponents</groupId>

      <artifactId>httpclient</artifactId>
@@ -138,10 +131,12 @@ 
      <groupId>com.fasterxml.jackson.core</groupId>

      <artifactId>jackson-annotations</artifactId>

    </dependency>



    <dependency>

      <groupId>com.fasterxml.jackson.core</groupId>

      <artifactId>jackson-databind</artifactId>

    </dependency>



    <dependency>

      <groupId>com.fasterxml.jackson.core</groupId>

      <artifactId>jackson-core</artifactId>
@@ -152,6 +147,11 @@ 
      <artifactId>fastjson</artifactId>

    </dependency>



    <dependency>

      <groupId>commons-collections</groupId>

      <artifactId>commons-collections</artifactId>

    </dependency>



    <dependency>

      <groupId>org.quartz-scheduler</groupId>

      <artifactId>quartz</artifactId>
@@ -171,19 +171,19 @@ 
    <dependency>

      <groupId>io.springfox</groupId>

      <artifactId>springfox-swagger2</artifactId>

      <version>2.9.2</version>

      <version>${springfox.version}</version>

    </dependency>



    <dependency>

      <groupId>io.springfox</groupId>

      <artifactId>springfox-swagger-ui</artifactId>

      <version>2.9.2</version>

      <version>${springfox.version}</version>

    </dependency>



    <dependency>

      <groupId>com.github.xiaoymin</groupId>

      <artifactId>swagger-bootstrap-ui</artifactId>

      <version>1.9.3</version>

      <version>${swagger.version}</version>

    </dependency>



    <dependency>
@@ -191,38 +191,37 @@ 
      <artifactId>dolphinscheduler-rpc</artifactId>

    </dependency>



    <dependency>

      <groupId>junit</groupId>

      <artifactId>junit</artifactId>

      <version>4.12</version>

      <scope>test</scope>

    </dependency>



    <dependency>

      <groupId>org.apache.curator</groupId>

      <artifactId>curator-framework</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.curator</groupId>

      <artifactId>curator-recipes</artifactId>

    </dependency>



    <!-- hadoop -->

    <dependency>

      <groupId>org.apache.hadoop</groupId>

      <artifactId>hadoop-common</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.hadoop</groupId>

      <artifactId>hadoop-client</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.hadoop</groupId>

      <artifactId>hadoop-hdfs</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.hadoop</groupId>

      <artifactId>hadoop-yarn-common</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.hadoop</groupId>

      <artifactId>hadoop-aws</artifactId>
@@ -231,11 +230,40 @@ 
    <dependency>

      <groupId>tomcat</groupId>

      <artifactId>jasper-runtime</artifactId>

      <version>${jasper-runtime.version}</version>

    </dependency>



    <dependency>

      <groupId>javax.servlet</groupId>

      <artifactId>servlet-api</artifactId>

      <version>${servlet-api.version}</version>

    </dependency>



    <!-- just for test -->

    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-test</artifactId>

      <scope>test</scope>

      <exclusions>

        <exclusion>

          <groupId>org.ow2.asm</groupId>

          <artifactId>asm</artifactId>

        </exclusion>

        <exclusion>

          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot</artifactId>

        </exclusion>

        <exclusion>

          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot-autoconfigure</artifactId>

        </exclusion>

      </exclusions>

    </dependency>



    <dependency>

      <groupId>junit</groupId>

      <artifactId>junit</artifactId>

      <scope>test</scope>

    </dependency>



    <dependency>

dolphinscheduler-rpc/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 


    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <maven.compiler.source>1.7</maven.compiler.source>

        <maven.compiler.target>1.7</maven.compiler.target>

        <maven.compiler.source>1.8</maven.compiler.source>

        <maven.compiler.target>1.8</maven.compiler.target>



        <protobuf.version>3.5.1</protobuf.version>

        <grpc.version>1.9.0</grpc.version>