Skip to content

Commit

Permalink
升级spring boot至2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xuanbo committed Apr 26, 2020
1 parent 2257eea commit a398286
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
13 changes: 13 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
*.html linguist-language=java
*.js linguist-language=java
*.css linguist-language=java
*.scss linguist-language=java
*.less linguist-language=java
*.yml linguist-language=java
*.json linguist-language=java
*.svg linguist-language=java
*.svg linguist-language=java
*.eot linguist-language=java
*.ttf linguist-language=java
*.woff linguist-language=java
*.woff2 linguist-language=java
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
<artifactId>kettle-web</artifactId>
<version>1.0.0</version>

<packaging>jar</packaging>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
<spring.boot.version>2.2.0.RELEASE</spring.boot.version>
<slf4j.version>1.7.25</slf4j.version>
<kettle.version>7.1.0.0-12</kettle.version>
<hadoop.version>2.6.0</hadoop.version>
<hive.version>1.2.1</hive.version>
</properties>

<repositories>
Expand Down Expand Up @@ -164,7 +168,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.6.0</version>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -231,7 +235,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<version>1.2.1</version>
<version>${hive.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.springframework.context.annotation.Configuration;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -39,6 +40,14 @@ public void setup() {
}
}

/**
* 销毁kettle运行环境
*/
@PreDestroy
public void cleanup() {
KettleEnvironment.shutdown();
}

/**
* 配置kettle任务运行线程池
*
Expand Down

0 comments on commit a398286

Please sign in to comment.