Commit Graph

2548 Commits

Author SHA1 Message Date
Andy Wilkinson
4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Spring Operator
991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Operator
e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
2019-03-19 16:44:10 +00:00
Spring Operator
7c314122f7 Update build and setup configuration to use HTTPS
See gh-16243
2019-03-19 16:01:05 +00:00
Andy Wilkinson
821ee0cf83 Ensure that @Bean methods are only declared on @Configuration classes
Closes gh-16190
2019-03-11 15:01:59 +00:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Spring Buildmaster
9bb64a3493 Next Development Version 2018-11-29 09:52:39 +00:00
Spring Buildmaster
4d24feb443 Next development version 2018-10-16 08:44:44 +00:00
Andy Wilkinson
a91f9b6f17 Document that Cassandra policy classes must have a default constructor
Closes gh-14461
2018-09-17 15:46:38 +01:00
Madhura Bhave
b5815b71d5 Fix formatting 2018-09-14 11:39:30 -07:00
Madhura Bhave
5a3d3c105b Fix javadoc 2018-09-14 11:10:16 -07:00
Spring Buildmaster
46df506b0a Next development version 2018-09-11 14:24:40 +00:00
Andy Wilkinson
0bd7c8afba Align server.tomcat.internal-proxies default with RemoteIPValve's default
Closes gh-13798
2018-09-11 12:08:03 +01:00
Andy Wilkinson
124705080b Tolerate context root redirect not being configurable on Tomcat 7
Closes gh-13821
2018-09-07 14:04:23 +01:00
Andy Wilkinson
db903c2176 Align defaults in ServerProperties with defaults at runtime
Closes gh-13821
2018-09-07 10:51:39 +01:00
Stephane Nicoll
7d54eda6f1 Fix tests 2018-09-07 10:47:20 +02:00
Phillip Webb
a50686b404 Surface additional rabbit SSL factory properties
Add `validate-server-certificate` and `verify-hostname` properties to
`spring.rabbitmq.ssl` to allow additional SSL configuration.

Closes gh-14259
2018-09-04 15:07:53 -07:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Phillip Webb
17de1571f5 Update copyright year 2018-08-30 15:52:58 -07:00
Phillip Webb
a085541d26 Polish 2018-08-30 15:52:58 -07:00
Spring Buildmaster
73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Stephane Nicoll
7865233b16 Fix Flyway filesystem prefix location check
Co-authored-by: Andy Bell <andyrbell@gmail.com>

Closes gh-13863
2018-07-24 10:31:53 +02:00
Johnny Lim
0fd4e40e6e Add null guards for getBeanDefinition() in BeanTypeRegistry
Closes gh-13818
2018-07-20 17:03:35 +01:00
Andy Wilkinson
6dc14af92d Update view of bean types when an override is detected
Previously, when a bean was overridden and its type changes,
BeanTypeRegistry could be left with a stale view of the bean's type.
This would lead to incorrect bean condition evaluation as conditions
would match or not match based on the bean's old type.

This commit updates the type registry to refresh its view of a bean's
type when its definition changes.

Closes gh-13588
2018-07-11 16:46:37 +01:00
Andy Wilkinson
73a08dd668 Avoid overriding beans and ensure import order is used for DataSource
During processing of a configuration class, the class's complete
hierarchy is processed and during the processing of each class its
member classes are processed. Previously, each pool-specific
inner-class of DataSourceConfiguration extended the abstract outer
class. This meant that when the import from
DataSourceAutoConfiguration.PooledDataSourceConfiguration caused the
first pool-specific inner-class to be  processed,
DataSourceConfiguration would be processed as it was the inner-class's
superclass. In turn all of DataSourceConfiguration's member classes
would then be processed. This caused the first import (of
DataSourceConfiguration.Tomcat) to trigger processing of all of the
other pool-specific inner-classes in whatever order they were found
rather than them being processed in the order in which they are
imported by DataSourceAutoConfiguration.PooledDataSourceConfiguration.

Another part of the problem was that none of the pool-specific
inner-classes were conditional on a missing DataSource bean. This
meant that, when multiple pools were on the classpath, each class
after the first would override the previous class's definition of the
DataSource bean.

This commit updates each of the pool-specific inner-classes so that
they no longer extend DataSourceConfiguration. This ensures that
the inner classes are processed in the order defined in the import
on PooledDataSourceConfiguration. Each of the classes has also been
annotated with @ConditionalOnMissingBean(DataSource.class). This
prevents the DataSource bean definition from being overridden and
ensures that the order of precedence for the pool that will be used
is as defined in the import.

Closes gh-13737
2018-07-10 09:45:15 +01:00
Andy Wilkinson
b1d8cc55fc Polish "Fix JSP availability check when not running as a packaged war"
Closes gh-12859
2018-06-21 17:30:12 +01:00
Mandap
82465cf435 Fix JSP availability check when not running as a packaged war
See gh-12859
2018-06-21 17:21:00 +01:00
Andy Wilkinson
e7b03f7ca3 Don't auto-configure MultipartConfigElement when using Commons FileUpload
Previously, when a user had declared a custom MultipartResolver bean
that is a CommonsMultipartResolver, part resolution would fail. The
failure was occurring as the servlet container was consuming the parts
before CommonsMultipartResolver had a chance to read them. This was
happening because a MultipartConfigElement was being auto-configured.

This commit updates the multipart auto-configuration so that a
MultipartConfigElement is not auto-configured when there is a
CommonsMultipartResolver bean in the context.

Closes gh-7735
2018-06-20 12:05:23 +01:00
Stephane Nicoll
99f993bc82 Add tests for JndiConnectionFactoryAutoConfiguration
Closes gh-13526
2018-06-19 20:47:23 +02:00
Spring Buildmaster
36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00
Brian Clozel
1b81f6f4c0 Fix security test with changes in SPR-16836
This commit replaces the use of a GET method by a DELETE method for
testing that the HiddenHttpMethodFilter is ordered before the security
filter. With SPR-16836 changes, only PUT DELETE and PATCH are now
allowed.
2018-06-12 16:39:42 +02:00
Stephane Nicoll
c67aedd8bc Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
Closes gh-13338
2018-06-04 14:08:58 +02:00
Martin Theiss
76b9d0d243 Retrieve javax.cache.CacheManager using Bean ClassLoader
This commit uses the bean's classloader to retrieve the CacheManager to
prevent issues with off-heap serialization.

See gh-13338
2018-06-04 14:08:57 +02:00
Stephane Nicoll
f745f20c8c Clarify scope of JNDI-based MailSenderAutoConfiguration
This commit separates the auto-configuration of JavaMailSender in two
distinct configuration: one based on existing Session available on JNDI
and the other one based on properties configuration.

This clarifies the auto-configuration report and the fact that the JNDI
variant overrides any Session-related properties that would have been
set in the environment

Closes gh-13026
2018-05-31 16:20:40 +02:00
Phillip Webb
5243adce22 Restore Java 1.6 compatibility 2018-05-30 18:23:17 -07:00
Phillip Webb
4d84933ee4 Also call setHttpOnly property on Tomcat context
Update `ServerProperties` to also call `setHttpOnly` on the
`TomcatContext`. It appears that this is required in addition to
using the `ServletContextInitializer` to setup `SessionCookieConfig`.

Closes gh-12580
2018-05-30 12:02:46 -07:00
Stephane Nicoll
3118f14dbb Fix NPE when OnExpressionCondition is invoked with a null BeanFactory
Closes gh-13249
2018-05-28 14:22:38 +02:00
Phillip Webb
4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Stephane Nicoll
8997143f31 Fix checkstyle violations 2018-05-24 11:40:54 +02:00
Phillip Webb
37646517cf Polish 2018-05-21 15:17:42 -07:00
Stephane Nicoll
d9029ef69e Fix documentation of spring.kafka.producer.batch-size
Closes gh-13127
2018-05-17 16:08:38 +02:00
Stephane Nicoll
b48f34117e Polish "Add support for Jersey WrappingResourceConfig"
Closes gh-13117
2018-05-11 09:29:36 +02:00
Zoltan Reegn
dfcd87207f Add support for Jersey WrappingResourceConfig
See gh-13117
2018-05-11 09:29:09 +02:00
Spring Buildmaster
010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Phillip Webb
99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb
0a0247975c Formatting 2018-05-04 12:00:50 -07:00
Stephane Nicoll
1314aaa368 Avoid early init of CacheManager
This commit restructures the Cache auto-configuration to avoid an early
init on CacheManager (and potentially all its infrastructure). Rather
than adding a dependency on the validator bean, this commit relies on
the fact CacheAspectSupport checks if a CacheManager is available in the
afterSingletonsInstantiated callback. In this case, a simple bean with
a postconstruct callback is enough.

Closes gh-13038
2018-05-04 16:25:06 +02:00
Phillip Webb
4e96587dc8 Polish modifier declaration ordering
Follow that Java language specification.
2018-05-03 09:46:15 -07:00