mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.0.x' into 2.1.x
Closes gh-17087
This commit is contained in:
commit
80e5762457
@ -5,5 +5,6 @@ source $(dirname $0)/common.sh
|
|||||||
repository=$(pwd)/distribution-repository
|
repository=$(pwd)/distribution-repository
|
||||||
|
|
||||||
pushd git-repo > /dev/null
|
pushd git-repo > /dev/null
|
||||||
|
run_maven -N clean verify
|
||||||
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
|
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
4
pom.xml
4
pom.xml
@ -60,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>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>check</goal>
|
<goal>check</goal>
|
||||||
@ -73,9 +74,10 @@
|
|||||||
<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
|
<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
|
||||||
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
|
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
|
||||||
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
<sourceDirectories>${basedir}</sourceDirectories>
|
<sourceDirectories>${basedir}</sourceDirectories>
|
||||||
<includes>**/*</includes>
|
<includes>**/*</includes>
|
||||||
<excludes>.git/**/*,target/**/,**/.flattened-pom.xml</excludes>
|
<excludes>**/.git/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class,**/spring-boot-gradle-plugin/build/**</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>check</goal>
|
<goal>check</goal>
|
||||||
|
Loading…
Reference in New Issue
Block a user