Merge remote-tracking branch 'origin/master'

沈斌

2017-10-24 918315ff05823dc5b1bc68b395e812799b1ee2d3

 pom.xml

@@ -11,6 +11,8 @@


  <properties>

    <springversion>4.3.7.RELEASE</springversion>

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

    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

  </properties>



  <dependencies>

@@ -185,6 +187,19 @@




  <build>

    <finalName>monitor</finalName>

    <finalName>task</finalName>



      <plugins>

          <plugin>

              <groupId>org.apache.maven.plugins</groupId>

              <artifactId>maven-compiler-plugin</artifactId>

              <version>2.3.2</version>

              <configuration>

                  <source>1.8</source>

                  <target>1.8</target>

                  <encoding>UTF-8</encoding>

              </configuration>

          </plugin>

      </plugins>

  </build>

</project>