Skip to content

S
spring-boot
Commit 5fba43aa authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '1.5.x' into 2.0.x

parents eb9ffd5e e61f7a33
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 78 deletions
pom.xml
View file @ 5fba43aa
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
</activation> </activation>
<properties> <properties>
<spring-javaformat.version>0.0.9</spring-javaformat.version> <spring-javaformat.version>0.0.9</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>
...@@ -43,6 +44,11 @@ ...@@ -43,6 +44,11 @@
<artifactId>spring-javaformat-checkstyle</artifactId> <artifactId>spring-javaformat-checkstyle</artifactId>
<version>${spring-javaformat.version}</version> <version>${spring-javaformat.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.spring.nohttp</groupId>
<artifactId>nohttp-checkstyle</artifactId>
<version>${nohttp-checkstyle.version}</version>
</dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
...@@ -54,6 +60,7 @@ ...@@ -54,6 +60,7 @@
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation> <suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion> <propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<resourceIncludes>**\/*.*</resourceIncludes>
</configuration> </configuration>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
......
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
View file @ 5fba43aa
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout"> <html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
<head> <head>
<title layout:fragment="title">Content</title> <title layout:fragment="title">Content</title>
</head> </head>
......
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
View file @ 5fba43aa
...@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory; ...@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* A <a href="http://livereload.com">livereload</a> server. * A <a href="https://github.com/livereload">livereload</a> server.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.3.0 * @since 1.3.0
* @see <a href="http://livereload.com">livereload.com</a>
*/ */
public class LiveReloadServer { public class LiveReloadServer {
......
src/checkstyle/checkstyle-suppressions.xml
View file @ 5fba43aa
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd"> "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions> <suppressions>
<suppress files="[\\/]target[\\/]" checks=".*" />
<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
<suppress files="SpringApplicationTests\.java" checks="FinalClass" /> <suppress files="SpringApplicationTests\.java" checks="FinalClass" />
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
......
src/checkstyle/checkstyle.xml
View file @ 5fba43aa
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd"> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
<module name="com.puppycrawl.tools.checkstyle.Checker"> <module name="com.puppycrawl.tools.checkstyle.Checker">
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
<property name="whitelistFileName" value="${main.basedir}/src/checkstyle/nohttp-whitelist.txt"/>
</module>
<module name="io.spring.javaformat.checkstyle.SpringChecks" /> <module name="io.spring.javaformat.checkstyle.SpringChecks" />
<module name="com.puppycrawl.tools.checkstyle.TreeWalker"> <module name="com.puppycrawl.tools.checkstyle.TreeWalker">
<module <module
......
src/checkstyle/nohttp-whitelist.txt 0 → 100644
View file @ 5fba43aa
^http://livereload.com/protocols/official-7$
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment