Skip to content

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

Merge branch '2.0.x' into 2.1.x 

Closes gh-17087
parents fed11feb da1d4b8c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
ci/scripts/build-project.sh
View file @ 80e57624
...@@ -5,5 +5,6 @@ source $(dirname $0)/common.sh ...@@ -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
pom.xml
View file @ 80e57624
...@@ -60,6 +60,7 @@ ...@@ -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 @@ ...@@ -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>
......
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