iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issue 6427 fix incompatible dependencies (#6428)

Browse Source 
* fix 6427 - update Spring Boot to 2.1.3, update Spring Cloud to Greenwich.RELEASE

* cleanup: specify Thymeleaf namespace, `@ComponentScan` is redundant near `@SpringBootApplication`
This commit is contained in:
Paul 2019-02-27 20:54:22 +03:00 committed by maibin
parent b293765466
commit c575ba8d6f
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parent-boot-2/pom.xml
View File

@ -78,8 +78,6 @@
<rest-assured.version>3.1.0</rest-assured.version>
<!-- plugins -->
<thin.version>1.0.11.RELEASE</thin.version>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
</properties>
</project>

6
spring-boot-bootstrap/pom.xml
View File

@ -84,7 +84,7 @@
<id>openshift</id>
<properties>
<spring-cloud-k8s.version>0.3.0.RELEASE</spring-cloud-k8s.version>
<spring-cloud.version>Finchley.SR2</spring-cloud.version>
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
<fabric8.maven.plugin.version>3.5.37</fabric8.maven.plugin.version>
</properties>
<dependencyManagement>
@ -166,7 +166,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Finchley.SR1</version>
<version>Greenwich.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -214,7 +214,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Finchley.SR1</version>
<version>Greenwich.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
spring-boot-bootstrap/src/main/java/com/baeldung/Application.java
View File

@ -4,12 +4,10 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@ServletComponentScan
@SpringBootApplication
@ComponentScan("com.baeldung")
@SpringBootApplication(scanBasePackages = "com.baeldung")
@EnableJpaRepositories("com.baeldung.persistence.repo")
@EntityScan("com.baeldung.persistence.model")
public class Application {

10
spring-boot-bootstrap/src/main/resources/templates/error.html
View File

@ -1,19 +1,19 @@
<html lang="en">
<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
<head>
<title>Error Occurred</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
</head>
<body>
<div class="container">
<h1>Error Occurred!</h1>
<div class="alert alert-danger" role="alert">
<h1>Error Occurred!</h1>
<div class="alert alert-danger" role="alert">
<b>
[<span th:text="${status}">status</span>]
<span th:text="${error}">error</span>
</b>
<p th:text="${message}">message</p>
</div>
</div>
</div>
</body>
</html>
</html>

4
spring-boot-bootstrap/src/main/resources/templates/home.html
View File

@ -1,7 +1,7 @@
<html>
<html xmlns:th="http://www.w3.org/1999/xhtml" lang="en">
<head><title>Home Page</title></head>
<body>
<h1>Hello !</h1>
<p>Welcome to <span th:text="${appName}">Our App</span></p>
</body>
</html>
</html>