Commit Graph

3876 Commits (165b85dd0e23d71c96d3f07cfe2ccc4885c70ce3)
 

Author SHA1 Message Date
Phillip Webb 165b85dd0e Improve @ConfigurationProperty binding exception
Include more details in the message including the class being bound
and the prefix from the annotation.

Fixes gh-2246
10 years ago
Phillip Webb 0fc89ddb20 Make ConfigFileApplicationListener consts public
Update ConfigFileApplicationListener to make some of the static final
constants public.

Fixes gh-2253
10 years ago
Phillip Webb 64217aa6c3 Merge pull request #2288 from kdvolder/gh-2287
* gh-2287:
  Don't fail build on merge failure
10 years ago
Kris De Volder 2dfa424246 Don't fail build on merge failure
Be more lenient when processing additional metadata json files.

Fixes gh-2287
Closes gh-2288
10 years ago
Phillip Webb 7c29c96da6 Change additional metadata file lookup logic
Update ConfigurationMetadataAnnotationProcessor to find the additional
metadata json file using createResource rather than getResource. Prior
to this commit the file could be skipped when multiple files were
contained on the classpath.

Fixes gh-2271
10 years ago
Phillip Webb 44d81d43f6 Merge branch '1.1.x' 10 years ago
Phillip Webb bd83aca63f Fix InMemoryAuditEventRepository search by date
Update InMemoryAuditEventRepository to consider the date when searching
for events. Also switch to a circular buffer implementation and update
the capacity to limit the total number of items rather than limiting
per principal.

Fixes gh-2291
10 years ago
Phillip Webb 1c51830995 Don't replace existing web scopes
Update EmbeddedWebApplicationContext to store then restore any existing
web scopes that may have been registered. This allows custom web scopes
to be registered in an ApplicationContextInitializer.

Fixes gh-2082
10 years ago
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