Commit Graph

50613 Commits

Author SHA1 Message Date
Phillip Webb
6ddabb871a Merge branch '1.1.x' 2015-01-05 11:57:38 -08:00
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
2015-01-05 11:57:02 -08:00
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
2015-01-04 11:49:06 -08:00
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
2015-01-03 12:59:00 -08:00
Phillip Webb
f369a72264 Merge branch '1.1.x' 2015-01-03 12:29:38 -08:00
Phillip Webb
20dbf4ab15 Remove duplicate jetty-util dependency
See gh-2180
2015-01-03 12:29:00 -08:00
Phillip Webb
a36c3b977c Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2015-01-02 16:22:49 -08:00
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
2015-01-02 16:21:47 -08:00
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
2015-01-02 15:31:39 -08:00
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
2015-01-02 15:07:44 -08:00
Phillip Webb
4616be9e91 Merge branch '1.1.x'
Conflicts:
	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
2015-01-02 11:34:16 -08:00
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
2015-01-02 11:32:04 -08:00
Phillip Webb
302ce17092 Remove "fully leaded" colloquialism
Update IntegrationTest Javadoc to remove the "fully leaded"
colloquialism.

See gh-2272
2015-01-02 10:46:02 -08:00
Phillip Webb
ad69a1aec9 Merge pull request #2265 from metcox/master
* pull2265:
  Fix global `endpoints.enabled` property support
2014-12-31 19:09:01 -08:00
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
2014-12-31 19:05:25 -08:00
Phillip Webb
491a61d54a Merge pull request #2266 from mafr/master
* pull2266:
  Add application version info to JAR manifest
2014-12-31 19:01:00 -08:00
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
2014-12-31 19:00:27 -08:00
Phillip Webb
161cb7ab8a Merge pull request #2270 from ericdahl/docs-health-builder
* docs-health-builder:
  Update custom HealthIndicator documentation
2014-12-31 18:55:14 -08:00
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
2014-12-31 18:53:58 -08:00
Phillip Webb
788b69d98d Merge branch '1.1.x' 2014-12-30 15:39:55 -08:00
Dave Syer
f4e12e96c6 Additional condition to protect Reactor 2.0 users
(cherry picked from 80d55c47)
Closes gh-2255
2014-12-30 15:39:13 -08:00
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
2014-12-30 14:31:25 -08:00
Phillip Webb
c08f912abd Merge branch '1.1.x' 2014-12-30 14:25:34 -08:00
Russell Allen
fe83aed6b2 Grammar correction
Closes gh-2262
2014-12-30 14:24:13 -08:00
Stephane Nicoll
7d180ee8ed Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-12-30 16:37:20 +01:00
Stephane Nicoll
1567c00ef0 Upgrade to Spring Framework 4.0.9
Closes gh-2259
2014-12-30 16:33:49 +01:00
Stephane Nicoll
2b3061b31f Upgrade to Spring 4.1.4
Closes gh-2249
2014-12-30 14:54:25 +01:00
Stephane Nicoll
95cf63f685 Switch to Spring snapshot
See gh-2249
2014-12-29 10:20:09 +01:00
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
2014-12-28 13:22:41 -08:00
Phillip Webb
c0d5ad0f0f Merge pull request #2250 from breun/master
* pull2250:
  Add docs for Spring Boot CLI via MacPorts
2014-12-28 12:27:20 -08:00
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
2014-12-28 12:26:06 -08:00
Phillip Webb
c7cfdbe250 Polish appendix 2014-12-28 12:22:16 -08:00
Phillip Webb
6ece075aec Merge branch '1.1.x' 2014-12-28 12:19:30 -08:00
Phillip Webb
a0667ba4bb Polish docs 2014-12-28 12:10:44 -08:00
Stephane Nicoll
0a19fd0af0 Merge branch '1.1.x' 2014-12-28 10:52:16 +01:00
Stephane Nicoll
38594cd820 Remove unused code
Closes gh-2244
2014-12-28 10:51:53 +01:00
Stephane Nicoll
2bf01ebeca Merge branch '1.1.x' 2014-12-27 18:28:50 +01:00
Stephane Nicoll
05e402295d Mention environment variables mapping in the guide
Closes gh-2234
2014-12-27 18:28:13 +01:00
Dave Syer
94b06be683 Change bean name metricReporitory -> actuatorMetricRepository
Fixes gh-2189
2014-12-27 07:44:17 +00:00
Phillip Webb
d7a12a8791 Remove superfluous semi-colons 2014-12-26 20:48:53 -08:00
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
2014-12-26 13:44:09 -08:00
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
2014-12-26 11:48:13 -08:00
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
2014-12-26 11:42:10 -08:00
Stephane Nicoll
79413bf9ef Merge pull request #2236 from izeye/master
* pull2236:
  Remove unecessary semicolon
2014-12-26 11:11:24 +01:00
izeye
bff41358bf Remove unecessary semicolon 2014-12-26 11:11:01 +01:00
Phillip Webb
98135c964b Remove Principal handler logic from security
Update ManagementSecurityAutoConfiguration so that MVC Endpoints that
have Principal arguments are not treated in any special way. This
restores Spring Boot 1.1.x behavior where the 'sensitive' flag is used
to determine access rules.

The HealthMvcEndpoint still uses the Principal (when available) to
determine if full status information can be displayed. It now also
explicitly checks the environment for `endpoints.health.sensitive`
to determine if the user has opted-out and requires complete health
details.

The health MVC endpoint should now work as follows:

* Default configuration - No login is required, full information is only
  displayed if a Principal is available.
* endpoints.health.sensitive=true - Login is required, full information
  is displayed.
* endpoints.health.sensitive=false - Login is not required, full
  information is displayed.

Fixes gh-2211
2014-12-25 12:42:45 -08:00
Phillip Webb
22bb6f7598 Fix accidental fork logic change
Fix accidental change from commit b42c7fca.
2014-12-24 19:20:04 -08:00
Phillip Webb
b42c7fca64 Polish 2014-12-24 11:33:11 -08:00
Phillip Webb
291a8d422b Fix incorrect BitronixJtaConfiguration bean name
Fixes gh-2231
2014-12-24 10:58:28 -08:00
Phillip Webb
45c5e25a05 Polish 2014-12-24 10:57:42 -08:00