nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-514: Consolidate SpringBoot-Version

This commit is contained in:
Konstantin Kläger 2018-06-05 14:30:06 +02:00 committed by Holger Hagen
parent 000a728f4e
commit 2452057364
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-spring-example/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version> <version>2.0.2.RELEASE</version>
<relativePath /> <relativePath />
</parent> </parent>

16
lib/taskana-spring-example/src/main/java/pro/taskana/SpringBootWebApplication.java
View File

@ -3,20 +3,20 @@ package pro.taskana;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.ImportResource;
@SpringBootApplication @SpringBootApplication
@ImportResource("applicationContext.xml") @ImportResource("applicationContext.xml")
public class SpringBootWebApplication extends SpringBootServletInitializer { public class SpringBootWebApplication extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(SpringBootWebApplication.class); return application.sources(SpringBootWebApplication.class);
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
SpringApplication.run(SpringBootWebApplication.class, args); SpringApplication.run(SpringBootWebApplication.class, args);
} }
} }

2
lib/taskana-spring-txtest/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.7.RELEASE</version> <version>2.0.2.RELEASE</version>
<relativePath /> <relativePath />
</parent> </parent>

2
lib/taskana-spring/pom.xml
View File

@ -143,7 +143,7 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>5.0.5.RELEASE</spring.version> <spring.version>5.0.5.RELEASE</spring.version>
<spring-boot.version>2.0.1.RELEASE</spring-boot.version> <spring-boot.version>2.0.2.RELEASE</spring-boot.version>
</properties> </properties>
<dependencies> <dependencies>