Skip to content

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

Merge branch '2.1.x'

parents e06325e0 0ef33101
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 39 deletions
pom.xml
View file @ db75347e
......@@ -60,7 +60,9 @@
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<resourceIncludes>**\/*.*</resourceIncludes>
<sourceDirectories>./</sourceDirectories>
<includes>**/*</includes>
<excludes>.git/**/*,target/**/*</excludes>
</configuration>
<goals>
<goal>check</goal>
......
spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/pom.xml
View file @ db75347e
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2012-2019 the original author or authors.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
......
src/checkstyle/checkstyle-suppressions.xml
View file @ db75347e
......@@ -3,8 +3,13 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress files="[\\/]target[\\/]" checks=".*" />
<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
<suppress files="\.DS_Store" checks=".*" />
<suppress files="[\\/]\.flattened-pom\.xml" checks=".*" />
<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
<suppress files="[\\/]target[\\/]" checks=".*" />
<suppress files="[\\/]build.log" checks=".*" />
<suppress files=".+\.[jar|git|ico|p12|svg|png]" checks=".*" />
<suppress files="eclipse[\\/]spring-boot-project.setup" checks="NoHttp"/>
<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
......
src/checkstyle/nohttp-whitelist.txt
View file @ db75347e
^http://livereload.com/protocols/official-7$
^http://livereload.com/protocols/official-7.*
^http://exslt.org/common.*
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