root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
17,162 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

1408 Commits

Author SHA1 Message Date
Stephane Nicoll 3b0c1354cb Upgrade to Maven Surefire/Failsafe Plugin 2.22.0 
Closes gh-13500
 2018-06-17 16:43:27 +02:00
Stephane Nicoll c738b73c6f Merge branch '2.0.x' 2018-06-13 09:29:36 +02:00
Johnny Lim 870d7fe16a Use @SpringBootTest.properties in tests and samples 
Closes gh-13453
 2018-06-13 09:24:28 +02:00
Phillip Webb e0ae805924 Update copyright header 2018-06-05 17:45:09 -07:00
Phillip Webb 845c20f13b Merge branch '2.0.x' 2018-06-05 17:14:34 -07:00
Phillip Webb e3bf518819 Merge branch '1.5.x' into 2.0.x 2018-06-05 17:13:47 -07:00
Phillip Webb 6c7289b822 Allow META-INF/resources in WAR classes folder 
Update `TomcatResources` so that `META-INF/resources` folders in
`src/main/resources` no longer fail with a "URI is not hierarchical"
exception.

Closes gh-13265
 2018-06-05 17:00:52 -07:00
Phillip Webb ade1397ea2 Merge branch '2.0.x' 2018-06-04 17:28:54 -07:00
Phillip Webb 571c50e43f Switch to functional web code to use static imports 
Update the samples and tests to use the more idiomatic static import
style.
 2018-06-04 17:27:34 -07:00
Phillip Webb 2274ac5214 Move spring-javaformat plugins to root POM 
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
 2018-06-04 17:25:19 -07:00
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1 
Closes gh-13322
 2018-06-01 09:30:42 +02:00
Madhura Bhave 9f4a5c13a5 Add auto-config for WebFlux OAuth2 Login 
Closes gh-13142
 2018-05-30 18:53:11 -07:00
Phillip Webb 353560278b Merge branch '2.0.x' 2018-05-30 13:29:41 -07:00
Phillip Webb 401fcbeaa4 Merge branch '1.5.x' into 2.0.x 2018-05-30 13:29:10 -07:00
Phillip Webb 2bfcefa48e Reinstate support for disabling build checking 
Closes gh-13291
 2018-05-30 13:24:06 -07:00
Phillip Webb 40800355c7 Merge branch '2.0.x' 2018-05-30 12:41:48 -07:00
Phillip Webb e38d5f910b Merge branch '1.5.x' into 2.0.x 2018-05-30 12:18:38 -07:00
Phillip Webb 09fa1e7e11 Polish 2018-05-30 12:12:01 -07:00
Phillip Webb b03f890567 Upgrade to spring-javaformat 0.0.2 2018-05-30 11:14:26 -07:00
Phillip Webb 2215709165 Merge branch '2.0.x' 2018-05-25 23:50:39 -07:00
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 2018-05-25 23:03:17 -07:00
Phillip Webb 9fd3b9103a Format code 2018-05-25 23:02:45 -07:00
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb e75d8eaf40 Switch to spring-javaformat plugin 
Use `spring-javaformat` to format and check code. Code formatting can
now be applied using the `spring-javaformat-maven-plugin` from the
command line. Existing checkstyle rules have also been replaced and
the CONTRIBUTING.adoc file has been updated.

Closes gh-13255
 2018-05-25 20:59:04 -07:00
Phillip Webb d8157c94f3 Merge branch '2.0.x' 2018-05-25 19:48:37 -07:00
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Phillip Webb e69296d7d3 Fix checkstyle violations in samples 2018-05-25 18:18:00 -07:00
Phillip Webb 4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Stephane Nicoll 1ea3e95ff6 Merge branch '2.0.x' 2018-05-22 13:40:51 +02:00
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment 
Closes gh-13231
 2018-05-22 13:39:02 +02:00
Stephane Nicoll 699b6ce6dc Remove reference to Jersey 1 
Closes gh-12582
 2018-05-22 10:50:27 +02:00
Stephane Nicoll 93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path 
Closes gh-12971
 2018-05-14 12:24:38 +02:00
Andy Wilkinson d2cef484cb Fix up version numbers following release 2018-05-09 11:25:21 +01:00
Spring Buildmaster 010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Phillip Webb 5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb 99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Phillip Webb 3ee777e142 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 09:46:15 -07:00
Stephane Nicoll 3c169b4e0a Fix bean name of EnvironmentEndpointWebExtension 
Closes gh-12827
 2018-04-11 11:34:44 +02:00
Johnny Lim f03849d502 Polish 
See gh-12812
 2018-04-10 11:46:16 +02:00
Phillip Webb 370915f8f0 Fixup version numbers following release 2018-04-09 18:20:41 -07:00
Spring Buildmaster c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Stephane Nicoll 3634a1d9d1 Fixup version numbers following release 2018-04-05 11:23:15 +02:00
Spring Buildmaster ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Andy Wilkinson 8608202e56 Remove Surefire workarounds that are not needed with 2.21 
Closes gh-12721
 2018-04-05 07:48:09 +01:00
Andy Wilkinson 4a47ab4b3e Make JAX-B available to the Jersey 1 sample on Java 9 2018-04-05 07:13:10 +01:00
Phillip Webb 7242ddae3c Polish 2018-04-04 12:05:08 -07:00
Stephane Nicoll ade6d86b65 Polish "Use secure connection to repositories" 
Closes gh-12629
 2018-03-27 18:02:52 +02:00
Phillip Webb a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
Phillip Webb a4b0be089d Polish 2018-03-14 14:05:26 -07:00