Commit Graph

7767 Commits (14d718852189e0d873857a51a021e0391667b0cc)
 

Author SHA1 Message Date
Andy Wilkinson c14c0ac152 Merge branch '1.3.x' 9 years ago
Andy Wilkinson ab96962833 Upgrade to Spring AMQP 1.5.4.RELEASE
Closes gh-5224
9 years ago
Andy Wilkinson efec3b5607 Upgrade to SLF4J 1.7.16
Closes gh-5223
9 years ago
Andy Wilkinson 3eafec5f83 Upgrade to Postgresql 9.4.1208.jre7
Closes gh-5222
9 years ago
Andy Wilkinson f5e450ebf7 Upgrade to Jolokia 1.3.3
Closes gh-5221
9 years ago
Andy Wilkinson a33325e3da Upgrade to Hibernate Validator 5.2.4.Final
Closes gh-5220
9 years ago
Andy Wilkinson 0c389945da Upgrade to Jersey 2.22.2
Closes gh-5219
9 years ago
Andy Wilkinson f734fd8d17 Upgrade to ActiveMQ 5.12.3
Closes gh-5217
9 years ago
Andy Wilkinson 1b84ccb449 Upgrade to thymeleaf-layout-dialect 1.3.3
Closes gh-5216
9 years ago
Andy Wilkinson ea34dcdcde Upgrade to HikariCP-java6 2.3.13
Closes gh-5215
9 years ago
Andy Wilkinson beb5f0bd41 Upgrade to Hazelcast 3.5.5
Closes gh-5214
9 years ago
Andy Wilkinson d9814bf529 Upgrade to H2 1.4.191
Closes gh-5213
9 years ago
Andy Wilkinson 2429e1a7e8 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 718f509271 Upgrade to Dependency Management Plugin 0.5.6.RELEASE
Closes gh-5211
9 years ago
Andy Wilkinson d3fc0a4733 Placate javac and its inferior type inferencing
The Eclipse compiler is perfectly happy with the original code, but
javac is not. This commit adds some explicit typing to keep javac
happy.
9 years ago
Stephane Nicoll 0e43f4204f Merge branch '1.3.x' 9 years ago
Stephane Nicoll 5febd497da Support customization of CacheManager
This commit allows to customize the auto-configured `CacheManager` by
exposing a bean of type `CacheManagerCustomizer`. The implementation may
reference the type of a `CacheManager` to determine in which case it has
to be invoked.

Several implementations can be provided and ordered using the regular
`Ordered` interface and `@Order` annotation.

Closes gh-5039
9 years ago
Andy Wilkinson ef44d660bb Merge branch '1.3.x' 9 years ago
Andy Wilkinson ce71bd997c Remove redundant public modifier 9 years ago
Andy Wilkinson 8f1f12be6a Fix Checkstyle warning introduced in forward merge (852ba546) 9 years ago
Andy Wilkinson bee651fc17 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 13971692dc Docs and actuator endpoints can be enabled when endpoints.enabled=false
Previously, if endpoints.enabled was false setting
endpoints.docs.enabled=true or endpoints.actuator.enabled=true would
have no effect as their entire configuration class was conditional
on endpoints.enabled being true.

This commit updates the conditions on the configuration class so that
it is conditional on either the actuator or docs endpoint being enabled.

Closes gh-5007
9 years ago
Andy Wilkinson 852ba54613 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 72aae34b67 Merge pull request #5032 from Matt Benson
* gh-5032:
  Fix logic for disabling plugins in CrshAutoConfiguration
9 years ago
Matt Benson 2a9e6c40ed Fix logic for disabling plugins in CrshAutoConfiguration
Plugin disabling logic was broken by e009d3e4. Prior to this change,
a plugin would be disabled if it or any of the implemented interfaces
in its inheritance hierarchy were configured as being disabled. The
offending commit inverted the logic so that the plugin would be
enabled if any part of it was NOT configured as being disabled.

This commit restores the logic such that the early return happens only
in the negative case.

Previously, the tests were written as though
PluginContext#getPlugin(Class) would consider the specified class
against the runtime type of the plugin (not an unreasonable
assumption); rather this method considers the broader 'plugin type'.
This commit rewrites the test to seek by plugin type and assert the
absence of the disabled plugins.

Closes gh-5032
9 years ago
Andy Wilkinson 36cdc81ef4 Merge branch '1.3.x' 9 years ago
Andy Wilkinson aa17599675 Clarify handling of files specified in spring.config.location
Closes gh-5147
9 years ago
Andy Wilkinson e04a8ff57d Merge branch '1.3.x' 9 years ago
Andy Wilkinson 70ab613465 Merge pull request #5168 from Vedran Pavic
* gh-5168:
  Tag Docker images created by launch script integration tests
9 years ago
Vedran Pavic 2641fe8f26 Tag Docker images created by launch script integration tests
Closes gh-5168
9 years ago
Andy Wilkinson f7eec4b3de Merge branch '1.3.x' 9 years ago
Andy Wilkinson b061aa5d7e Upgrade to Spring Data Gosling SR4
Closes gh-5119
9 years ago
Andy Wilkinson 03ebef58fb Merge branch '1.3.x' 9 years ago
Andy Wilkinson b1afd091c2 Document log file endpoint's support for using Range header
Closes gh-5062
9 years ago
Andy Wilkinson 64fd322ad1 Merge branch '1.3.x' 9 years ago
Andy Wilkinson a6b1f4ce63 Add a note about a fully executable jar's working directory
Closes gh-5164
9 years ago
Andy Wilkinson a3afc859bd Merge branch '1.3.x' 9 years ago
Andy Wilkinson 617c97322d Allow endpoint paths to be configured via endpoint.<name>.path
Support for configuring an endpoint’s path separately from its id was
introduced in 97255785, but it didn’t work for a variety of reasons:

 1. Some custom MVC endpoints did not have configuration properties
    bound to them
 2. Some generic endpoints rejected the path property as they were
    configured not to ignore unknown fields
 3. The property used to configure the path was dependent on the id
    of the endpoint. This meant that the path property’s name would
    change if the endpoint’s id was changed

This commit addresses these problems:

 1. @ConfigurationProperties has been added to custom MvcEndpoints where
    it was missing
 2. Generic endpoints have been updated to ignore unknown fields,
    allowing the path of their MVC adapter to be configured
 3. Rather than using the id of a generic endpoint to determine the name
    of its path property, the prefix or value of the endpoint’s
    @ConfigurationProperties annotation is used instead. Any generic
    endpoint that is not annotated with @ConfigurationProperties is
    ignored, making its path unconfigurable.

Closes gh-5105
9 years ago
Stephane Nicoll 2da9f6d91c Merge branch '1.3.x' 9 years ago
Stephane Nicoll c4205d04b3 Rework ListenerContainerFactory configurers
Rework commit b726974 to avoid exposing setters that would permit anyone
to change Spring Boot's defaults. Also, since these are configurers of a
specific instance, they should be named accordingly.

Closes gh-5138
9 years ago
Phillip Webb 34ae7e3eee Fix packages and annotations used in sample
Fixup accidental error in previous commit.
9 years ago
Phillip Webb 95c4cdbedc Fix packages and annotations used in sample
Update a few of the samples to correct the packages used in tests and
to make use of the `@SpringBootApplication` annotation.
9 years ago
Phillip Webb 566008336c Polish 9 years ago
Andy Wilkinson f46862d186 Merge branch '1.3.x' 9 years ago
Andy Wilkinson f94e8bd287 Do not try to auto-configure Jolokia if Spring MVC is not on classpath
The Jolokia auto-configuration requires ServletWrappingController from
Spring MVC to be on the classpath. This commit updates the
auto-configuration to make it conditional on the presence of this
class.

Closes gh-5153
9 years ago
Andy Wilkinson cc4562f96a Merge branch '1.3.x' 9 years ago
Andy Wilkinson b4cda625c4 Break cycle caused by JndiDataSourceAutoConfiguration
There's a long cycle when Spring Data REST, Data JPA and Actuator
are used in an app that retrieves its DataSource from JNDI. The cycle
is:

- WebMvcAutoConfiguration
- HttpMessageConverters
- MappingJackson2HttpMessageConverter (needs an ObjectMapper)
- SpringBootRepositoryRestMvcConfiguration
- ObjectMapper
- RepositoryResourceMappings (part of a custom Jackson module)
- Repositories
- EntityManagerFactory (Triggered by application's Spring Data JPA repository)
- HibernateJpaAutoConfiguration
- JndiDataSourceAutoConfiguration
- MBeanExporter (Used to prevent export of DataSource MBean that's already in JMX)
- EndpointMBeanExportAutoConfiguration
- ObjectMapper (Used to format JSON produced by the exported endpoints)

Spring Data Rest caused the ObjectMapper to depend on JPA. JPA depends
on the DataSource. JnidDataSourceAutoConfiguration depends on the
MBeanExporter. Actuator's MBeanExporter requires an ObjectMapper to
produce JSON strings.

This commit breaks the cycle by making JndiDataSourceAutoConfiguration
access the MBeanExporter lazily. Rather than using `@Lazy`. which does
not work with `@Autowired(required=false)`, the application context
is injected and the MBeanExporter is retrieved manually when it is
needed.

Closes gh-4980
9 years ago
Andy Wilkinson cb9780dbb8 Merge branch '1.3.x' 9 years ago
Andy Wilkinson d05f94170b Merge pull request #5190 from Gary Russell
* gh-5190:
  Upgrade to Spring Integration 4.2.5.RELEASE
9 years ago
Gary Russell 5e180641ec Upgrade to Spring Integration 4.2.5.RELEASE
Closes gh-5190
9 years ago