3868 Commits (5f959c557973923b797770cac7e01032e89d63c9)

 

All Branches   

Search

Author	SHA1	Message	Date
Phillip Webb	5f959c5579	Fix test failure introduced in d4b75edf	10 years ago
Phillip Webb	fb195b2ad7	Add test for ssl scheme ... Closes gh-2232	10 years ago
Phillip Webb	d4b75edfbf	Polish	10 years ago
Phillip Webb	dcc21616a9	Remove unnecessary Jetty secure config calls ... Closes gh-2232	10 years ago
Phillip Webb	9f956660a6	Add project lead CLA information ... Update CONTRIBUTING to include the project lead names that can be used.	10 years ago
Phillip Webb	6ddabb871a	Merge branch '1.1.x'	10 years ago
Phillip Webb	0622b3e987	Fix documentation code example error ... The "Customizing ConfigurableEmbeddedServletContainer directly" section should use `HttpStatus.NOT_FOUND` and not `HttpStatus.404` in the sample code. Fixes gh-2258	10 years ago
Phillip Webb	1f775793ee	Use Collections.addAll(...) instead of for loops ... Replace various for loops which add items to collections with calls to Collections.addAll(...). Fixes gh-2277	10 years ago
Phillip Webb	4940ca37eb	Move Log4J2LoggingSystem above Log4JLoggingSystem ... Change the LoggingSystem load order so that Log4J2 has a higher priority than Log4J. Also add system property support to allow a specific system to be used. Fixes gh-2274	10 years ago
Phillip Webb	f369a72264	Merge branch '1.1.x'	10 years ago
Phillip Webb	20dbf4ab15	Remove duplicate jetty-util dependency ... See gh-2180	10 years ago
Phillip Webb	a36c3b977c	Merge branch '1.1.x' ... Conflicts: spring-boot-dependencies/pom.xml	10 years ago
Phillip Webb	67302db9e5	Add dependency management for all Jetty modules ... Update spring-boot-dependencies to include all Jetty modules. The helps to prevent issues when modules are pulled in transitively (for example via solr). Fixes gh-2180	10 years ago
Phillip Webb	6333d4c617	Merge branch '1.1.x' ... Conflicts: spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java	10 years ago
Phillip Webb	7e771bb655	Fix ParentAwareNamingStrategy and JMX auto-config ... Fix ParentAwareNamingStrategy to set ObjectName properties for the 'identity' and 'context' attributes. Also update JmxAutoConfiguration to ensure that the ParentAwareNamingStrategy is created in each context and that the `mbeanExporter` bean is created. Prior to this commit the nested @EnableMBeanExport class always meant that the mbeanExporter condition never matched. Fixes gh-2243	10 years ago
Phillip Webb	4616be9e91	Merge branch '1.1.x' ... Conflicts: spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java	10 years ago
Phillip Webb	c46478f97d	Guard for multiple ContentNegotiatingViewResolvers ... Update WebMvcAutoConfiguration to ensure than the viewResolver bean is not created if a user defined ContentNegotiatingViewResolver bean is defined. Fixes gh-2269	10 years ago
Phillip Webb	302ce17092	Remove "fully leaded" colloquialism ... Update IntegrationTest Javadoc to remove the "fully leaded" colloquialism. See gh-2272	10 years ago
Phillip Webb	ad69a1aec9	Merge pull request #2265 from metcox/master ... * pull2265: Fix global `endpoints.enabled` property support	10 years ago
Mathieu Bernatet	bf839e57a5	Fix global `endpoints.enabled` property support ... Update AbstractEndpoint to correctly support the `endpoints.enabled` property. Also fix EnvironmentEnpoint which would previously prevent the Environment from being set. Fixes gh-2264 Closes gh-2265	10 years ago
Phillip Webb	491a61d54a	Merge pull request #2266 from mafr/master ... * pull2266: Add application version info to JAR manifest	10 years ago
Matthias Friedrich	91587d63a2	Add application version info to JAR manifest ... Update maven-jar-plugin configuration in spring-boot-starter-parent with `addDefaultImplementationEntries` so that implementation versions are included by default. Fixes gh-2266	10 years ago
Phillip Webb	161cb7ab8a	Merge pull request #2270 from ericdahl/docs-health-builder ... * docs-health-builder: Update custom HealthIndicator documentation	10 years ago
Eric Dahl	aa43f5e037	Update custom HealthIndicator documentation ... Update the custom HealthIndicator documentation to use the build() method rather than the old mechanism. Fixes gh-2270	10 years ago
Phillip Webb	788b69d98d	Merge branch '1.1.x'	10 years ago
Dave Syer	f4e12e96c6	Additional condition to protect Reactor 2.0 users ... (cherry picked from 80d55c47) Closes gh-2255	10 years ago
Dave Syer	bee6dd928e	Reverse priority of property sources when extracting sub properties ... (cherry picked from commit 300e570f) Fixes gh-2261 See gh-1259 Conflicts: spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java	10 years ago
Phillip Webb	c08f912abd	Merge branch '1.1.x'	10 years ago
Russell Allen	fe83aed6b2	Grammar correction ... Closes gh-2262	10 years ago
Stephane Nicoll	7d180ee8ed	Merge branch '1.1.x' ... Conflicts: spring-boot-dependencies/pom.xml	10 years ago
Stephane Nicoll	1567c00ef0	Upgrade to Spring Framework 4.0.9 ... Closes gh-2259	10 years ago
Stephane Nicoll	2b3061b31f	Upgrade to Spring 4.1.4 ... Closes gh-2249	10 years ago
Stephane Nicoll	95cf63f685	Switch to Spring snapshot ... See gh-2249	10 years ago
Phillip Webb	0735d6e259	Fix TemplateLocation.anyExists logic ... Fix broken logic in TemplateLocation.anyExists caused by not using the local `searchPath` variable. See gh-2184 Closes gh-2248	10 years ago
Phillip Webb	c0d5ad0f0f	Merge pull request #2250 from breun/master ... * pull2250: Add docs for Spring Boot CLI via MacPorts	10 years ago
Nils Breunese	6248d8c86e	Add docs for Spring Boot CLI via MacPorts ... Add MacPorts section to reference docs since the Spring Boot CLI is now also maintained in MacPorts. Closes gh-2250	10 years ago
Phillip Webb	c7cfdbe250	Polish appendix	10 years ago
Phillip Webb	6ece075aec	Merge branch '1.1.x'	10 years ago
Phillip Webb	a0667ba4bb	Polish docs	10 years ago
Stephane Nicoll	0a19fd0af0	Merge branch '1.1.x'	10 years ago
Stephane Nicoll	38594cd820	Remove unused code ... Closes gh-2244	10 years ago
Stephane Nicoll	2bf01ebeca	Merge branch '1.1.x'	10 years ago
Stephane Nicoll	05e402295d	Mention environment variables mapping in the guide ... Closes gh-2234	10 years ago
Dave Syer	94b06be683	Change bean name metricReporitory -> actuatorMetricRepository ... Fixes gh-2189	10 years ago
Phillip Webb	d7a12a8791	Remove superfluous semi-colons	10 years ago
Phillip Webb	fe20116b68	Propagate https scheme when using Jetty ... Update Jetty 9 SSL support to register the SecureRequestCustomizer which ensures that calling getScheme() on the HttpServletRequest returns 'https'. Fixes gh-2232	10 years ago
Phillip Webb	0702b4e7e3	Merge branch '1.1.x' ... Conflicts: spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java	10 years ago
Phillip Webb	96d479c3d9	Make RequestMappingHandlerMapping @Primary ... Update WebMvcAutoConfiguration so that the RequestMappingHandlerMapping bean is @Primary. Prior to this commit a NoUniqueBeanDefinitionException would be thrown then using the MvcUriComponentsBuilder. Fixes gh-2237	10 years ago
Stephane Nicoll	79413bf9ef	Merge pull request #2236 from izeye/master ... * pull2236: Remove unecessary semicolon	10 years ago
izeye	bff41358bf	Remove unecessary semicolon	10 years ago