mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.1.x' into 2.2.x
Closes gh-22547
This commit is contained in:
commit
f4508b4059
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@ transaction-logs
|
|||||||
secrets.yml
|
secrets.yml
|
||||||
.gradletasknamecache
|
.gradletasknamecache
|
||||||
.sts4-cache
|
.sts4-cache
|
||||||
|
.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
|
12
.mvn/extensions.xml
Normal file
12
.mvn/extensions.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<extensions>
|
||||||
|
<extension>
|
||||||
|
<groupId>com.gradle</groupId>
|
||||||
|
<artifactId>gradle-enterprise-maven-extension</artifactId>
|
||||||
|
<version>1.5.3</version>
|
||||||
|
</extension>
|
||||||
|
<extension>
|
||||||
|
<groupId>io.spring.ge.conventions</groupId>
|
||||||
|
<artifactId>gradle-enterprise-conventions-maven-extension</artifactId>
|
||||||
|
<version>0.0.5</version>
|
||||||
|
</extension>
|
||||||
|
</extensions>
|
25
.mvn/gradle-enterprise.xml
Normal file
25
.mvn/gradle-enterprise.xml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
<gradleEnterprise
|
||||||
|
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
|
||||||
|
<server>
|
||||||
|
<url>https://ge.spring.io</url>
|
||||||
|
</server>
|
||||||
|
<buildScan>
|
||||||
|
<publishIfAuthenticated>true</publishIfAuthenticated>
|
||||||
|
</buildScan>
|
||||||
|
<buildCache>
|
||||||
|
<local>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
</local>
|
||||||
|
<remote>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
<storeEnabled><![CDATA[#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null && env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null}]]></storeEnabled>
|
||||||
|
<server>
|
||||||
|
<credentials>
|
||||||
|
<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
|
||||||
|
<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
|
||||||
|
</credentials>
|
||||||
|
</server>
|
||||||
|
</remote>
|
||||||
|
</buildCache>
|
||||||
|
</gradleEnterprise>
|
@ -35,10 +35,10 @@ git add pom.xml > /dev/null
|
|||||||
git commit -m"Release v$stageVersion" > /dev/null
|
git commit -m"Release v$stageVersion" > /dev/null
|
||||||
git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
|
git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
|
||||||
|
|
||||||
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} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
|
||||||
run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
|
run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
|
||||||
run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
|
run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
|
||||||
run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
|
run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
|
||||||
|
|
||||||
git reset --hard HEAD^ > /dev/null
|
git reset --hard HEAD^ > /dev/null
|
||||||
if [[ $nextVersion != $snapshotVersion ]]; then
|
if [[ $nextVersion != $snapshotVersion ]]; then
|
||||||
|
33
pom.xml
33
pom.xml
@ -380,5 +380,38 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.gradle</groupId>
|
||||||
|
<artifactId>gradle-enterprise-maven-extension</artifactId>
|
||||||
|
<version>1.5.2</version>
|
||||||
|
<configuration>
|
||||||
|
<gradleEnterprise>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||||
|
<inputs>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<name>allowlist</name>
|
||||||
|
<paths>
|
||||||
|
<path>${main.basedir}/src/checkstyle</path>
|
||||||
|
</paths>
|
||||||
|
<normalization>RELATIVE_PATH</normalization>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
|
<properties>
|
||||||
|
<property>
|
||||||
|
<name>propertyExpansion</name>
|
||||||
|
<value>ignoredValue</value>
|
||||||
|
</property>
|
||||||
|
</properties>
|
||||||
|
</inputs>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</gradleEnterprise>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
This file is empty so that the starters project does not generate multiple build scans.
|
@ -88,6 +88,9 @@
|
|||||||
<addTestClassPath>true</addTestClassPath>
|
<addTestClassPath>true</addTestClassPath>
|
||||||
<skipInvocation>${skipTests}</skipInvocation>
|
<skipInvocation>${skipTests}</skipInvocation>
|
||||||
<streamLogs>true</streamLogs>
|
<streamLogs>true</streamLogs>
|
||||||
|
<properties>
|
||||||
|
<scan>false</scan>
|
||||||
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
@ -165,6 +165,9 @@
|
|||||||
<addTestClassPath>true</addTestClassPath>
|
<addTestClassPath>true</addTestClassPath>
|
||||||
<skipInvocation>${skipTests}</skipInvocation>
|
<skipInvocation>${skipTests}</skipInvocation>
|
||||||
<streamLogs>true</streamLogs>
|
<streamLogs>true</streamLogs>
|
||||||
|
<properties>
|
||||||
|
<scan>false</scan>
|
||||||
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
@ -29,6 +29,9 @@
|
|||||||
<pomIncludes>
|
<pomIncludes>
|
||||||
<pomInclude>pom.xml</pomInclude>
|
<pomInclude>pom.xml</pomInclude>
|
||||||
</pomIncludes>
|
</pomIncludes>
|
||||||
|
<properties>
|
||||||
|
<scan>false</scan>
|
||||||
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
Loading…
Reference in New Issue
Block a user