mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.0.x' into 2.1.x
This commit is contained in:
Phillip Webb
commit
0ef331018e
@ -14,4 +14,4 @@ case "$1" in
|
||||
*)
|
||||
echo $"Unknown java version"
|
||||
exit 1
|
||||
esac
|
||||
esac
|
||||
|
||||
@ -43,4 +43,4 @@ if [[ ${existing_jdk_issues} = "" ]]; then
|
||||
POST "https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues" > /dev/null || { echo "Failed to create issue" >&2; exit 1; }
|
||||
else
|
||||
echo "Issue already exists."
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -8,4 +8,4 @@ caches:
|
||||
- path: maven
|
||||
- path: gradle
|
||||
run:
|
||||
path: git-repo/ci/scripts/build-project.sh
|
||||
path: git-repo/ci/scripts/build-project.sh
|
||||
|
||||
4
pom.xml
4
pom.xml
@ -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>
|
||||
|
||||
@ -1 +1,2 @@
|
||||
|
||||
|
||||
|
||||
@ -113,4 +113,4 @@ if $cygwin; then
|
||||
fi
|
||||
|
||||
IFS=" " read -r -a javaOpts <<< "$JAVA_OPTS"
|
||||
"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@"
|
||||
"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@"
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -28,4 +28,4 @@
|
||||
<xsl:template match="/m:project/m:properties/m:revision" />
|
||||
<xsl:template match="/m:project/m:properties/m:main.basedir" />
|
||||
<xsl:template match="/m:project/m:distributionManagement" />
|
||||
</xsl:stylesheet>
|
||||
</xsl:stylesheet>
|
||||
|
||||
@ -3,4 +3,4 @@
|
||||
<xsl:copy-of select="projects/*[1]" />
|
||||
<xsl:copy-of select="*[local-name()='project']" />
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
</xsl:stylesheet>
|
||||
|
||||
@ -19,4 +19,4 @@
|
||||
</sources>
|
||||
</moduleSet>
|
||||
</moduleSets>
|
||||
</assembly>
|
||||
</assembly>
|
||||
|
||||
@ -274,4 +274,4 @@ inline fun <reified T : Any> TestRestTemplate.exchange(url: URI, method: HttpMet
|
||||
*/
|
||||
@Throws(RestClientException::class)
|
||||
inline fun <reified T : Any> TestRestTemplate.exchange(requestEntity: RequestEntity<*>): ResponseEntity<T> =
|
||||
exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
|
||||
exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -19,4 +19,4 @@ package org.test;
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,4 +4,4 @@ spring:
|
||||
resource:
|
||||
jwt:
|
||||
# To run the application, replace this with a valid JWK Set URI
|
||||
jwk-set-uri: https://example.com/oauth2/default/v1/keys
|
||||
jwk-set-uri: https://example.com/oauth2/default/v1/keys
|
||||
|
||||
@ -22,4 +22,4 @@ spring:
|
||||
client-secret: ${YAHOO-CLIENT-SECRET}
|
||||
provider:
|
||||
yahoo-oidc:
|
||||
issuer-uri: https://api.login.yahoo.com
|
||||
issuer-uri: https://api.login.yahoo.com
|
||||
|
||||
@ -4,4 +4,4 @@ spring:
|
||||
resourceserver:
|
||||
jwt:
|
||||
# To run the application, replace this with a valid JWK Set URI
|
||||
jwk-set-uri: https://example.com/oauth2/default/v1/keys
|
||||
jwk-set-uri: https://example.com/oauth2/default/v1/keys
|
||||
|
||||
@ -3,4 +3,4 @@
|
||||
<h1>Hello</h1>
|
||||
Hello World!
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<glassfish-web-app error-url="">
|
||||
<class-loader delegate="false"/>
|
||||
</glassfish-web-app>
|
||||
</glassfish-web-app>
|
||||
|
||||
@ -3,8 +3,12 @@
|
||||
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
|
||||
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
|
||||
<suppressions>
|
||||
<suppress files="[\\/]target[\\/]" 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]" 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" />
|
||||
|
||||
@ -1 +1,2 @@
|
||||
^http://livereload.com/protocols/official-7$
|
||||
^http://livereload.com/protocols/official-7.*
|
||||
^http://exslt.org/common.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user