Commit Graph

11970 Commits

Author SHA1 Message Date
Andy Wilkinson
ef12eecb7e Avoid a clash with TomcatURLStreamHandlerFactory
In the unlikely (outside the tests of a number of Spring Boot's
modules) event that both Tomcat and Jetty are on the classpath,
there's a risk that Tomcat will try to register its
URLStreamHandlerFactory after JasperInitializer has registered its
WarUrlStreamHandlerFactory. Should this happen, Tomcat will fail to
start.

TomcatURLStreamHandlerFactory registers a handler for the war: URLs
produced by org.apache.tomcat.util.scan.JarFactory that's used by
both Tomcat and Jetty's Jasper integration. This makes it a suitable
replacement for WarUrlStreamHandlerFactory so this commit updates
JasperIntializer to register TomcatURLStreamHandlerFactory when it's
available, falling back to WarUrlStreamHandlerFactory when it's not.

Closes gh-8622
2017-05-11 21:03:42 +01:00
Andy Wilkinson
71b53e816d Add temporary work around for regression in Spring Integration 2017-05-11 17:34:33 +01:00
Andy Wilkinson
b71daac58a Remove redundant logic for uninstalling Tomcat's URL stream handler factory
Closes gh-8622
2017-05-11 17:22:15 +01:00
Andy Wilkinson
5810ae28d5 Ensure that WebApplicationType.NONE results in a non-web environment
Following the changes made in a7f148091e the environment was being
bound to the SpringApplication instance after it had, if necessary
being converted to a standard, i.e non-web environment. This meant
that if a property in the environment set the web application type
to NONE it would have no effect on the type of environment used by
the application.

This commit reorders the binding of the environment to the
Spring Application instance so that it happens before the environment
is potentially converted.

Closes gh-9161
2017-05-11 15:57:53 +01:00
Stephane Nicoll
1bf7558a2c Merge pull request #9145 from vpavic:align-session-2.0
* pr/9145:
  Improve `HashMapSessionConfiguration`
2017-05-11 14:17:21 +02:00
Vedran Pavic
94f96a281f Improve HashMapSessionConfiguration
This commit updates `MapSessionRepository` bean definition return type
and applies equivalent change to `SessionAutoConfigurationTests`.

These changes also ensure compatibility with Spring Session 2.0 which
will merge `ExpiringSession` API with `Session` API.

Closes gh-9145
2017-05-11 14:05:25 +02:00
Stephane Nicoll
527c2e7b75 Add support for deprecation level in manual metadata
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.

This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.

Closes gh-9074
2017-05-11 11:46:06 +02:00
Stephane Nicoll
bb2a81cb6e Document spring.main.web-application-type
Closes gh-9159
2017-05-11 11:03:57 +02:00
Stephane Nicoll
3319be1c5a Upgrade to Spring Social 2.0.0.M3
Closes gh-6258
2017-05-11 08:29:08 +02:00
Stephane Nicoll
30daa8120e Upgrade to Spring Social Twitter 2.0.0.M2
Closes gh-9155
2017-05-11 08:18:32 +02:00
Stephane Nicoll
ba50599f6f Upgrade to Spring Social Linkedin 2.0.0.M2
Closes gh-9019
2017-05-11 08:14:31 +02:00
Stephane Nicoll
3547815805 Make sure Maven integration tests use a consistent java version
Closes gh-9149
2017-05-10 17:15:59 +02:00
Andy Wilkinson
9ee1edcca5 Polishing 2017-05-10 10:12:17 +01:00
Andy Wilkinson
771343e31b Update OAuth2 sample following breaking API change in Spring Security
See gh-8714 and 9480e09c21
2017-05-10 09:25:44 +01:00
Andy Wilkinson
918a11ea28 Upgrade to Spring Session 2.0.0.M1
Closes gh-8049
2017-05-10 08:48:32 +01:00
Andy Wilkinson
9480e09c21 Upgrade to Spring Security 5.0.0.M1
Closes gh-8714
2017-05-10 08:48:32 +01:00
Andy Wilkinson
8f1cf0ceb4 Upgrade to Spring Cloud Connectors 2.0.0.M1
Closes gh-8968
2017-05-10 08:18:41 +01:00
Phillip Webb
961d41f6f6 Reduce ConfigurationPropertyName memory usage
Significantly rework `ConfigurationPropertyName` in an attempt to reduce
the amount of memory and garbage produced. The name elements are now
stored as CharSequences and whenever possible subsequences are used.

This helps to reduce the memory footprint since the underlying char
array can be shared between the source string, and the individual
elements.

For example: `ConfigurationProperty.of("foo.bar.baz")` will return
a name that provides access to the elements `foo`, `bar` and `baz`.
However, these three names all share the same char[], just using
different offsets and lengths.

See gh-9000
2017-05-09 22:14:54 -07:00
Phillip Webb
d969ebad07 Polish ConfigurationPropertySource support
Improve ConfigurationPropertySource support by reworking some of the
stream calls based on advice offered by Tagir Valeev from JetBrains.

Also improved ConfigurationPropertySource.containsDescendantOf so that
it returns an enum rather than an Optional<Boolean> (again based on
feedback from Tagir).

See gh-9000
2017-05-09 22:09:40 -07:00
Phillip Webb
fa4de13519 Rework ConfigurationPropertySources
Rework the ConfigurationPropertySources and related adapter classes to
help with performance. The ConfigurationPropertySources class now only
monitors for updates when `.attach` is used. The `.get` methods now
return the adapted version, but no longer checks to see if sources have
been added or removed on each call.

This commit also fixes a few caching issues and makes both the
`PropertyMapper` implementations true static singletons.

See gh-9000
2017-05-09 22:09:40 -07:00
Phillip Webb
133f11df2f Refactor ConfigFileApplicationListener
Refactor `ConfigFileApplicationListener` to use a `MultiValueMap` when
loading sources. The helps to simplify the code and removes the need
for the inner `LoadedPropertySources` class. We're also able to delete
the now unused `EnumerableCompositePropertySource` and
`PropertySourcesLoader` classes.

Fixes gh-9144
2017-05-09 22:05:28 -07:00
Phillip Webb
5cad11d6d2 Formatting 2017-05-09 21:59:59 -07:00
Phillip Webb
fd2e3b3505 Merge branch '1.5.x' 2017-05-09 21:55:31 -07:00
Phillip Webb
931ce15d7f Update copyright header dates 2017-05-09 21:43:52 -07:00
Phillip Webb
4a7dcc8786 Formatting 2017-05-09 21:43:24 -07:00
Andy Wilkinson
6ef4ea9a25 Upgrade to Spring Data Kay M3
Closes gh-7461
2017-05-09 11:29:31 +01:00
Andy Wilkinson
f175f5bd54 Revert "Upgrade to Spring Data Kay M3"
This reverts commit a8b10f74e8.

See gh-7461
2017-05-09 09:50:04 +01:00
Andy Wilkinson
a8b10f74e8 Upgrade to Spring Data Kay M3
Closes gh-7461
2017-05-09 09:39:58 +01:00
Stephane Nicoll
5e14383886 Merge branch '1.5.x' 2017-05-09 09:38:47 +02:00
Stephane Nicoll
ea4e6fea35 Polish 2017-05-09 09:37:30 +02:00
Stephane Nicoll
f8e1345b75 Unify versions used in integration tests
This commit makes sure the integration tests use the same versions as
the one managed by `spring-boot-dependencies` (including Maven plugins).

Closes gh-8947
2017-05-09 09:36:21 +02:00
Stephane Nicoll
b686ed8b6b Merge pull request #9132 from artembilan:Spring_AMQP_2.0.0.M4
* pr/9132:
  Upgrade to Spring AMQP 2.0.0.M4
2017-05-09 08:52:54 +02:00
Artem Bilan
22406b7dce Upgrade to Spring AMQP 2.0.0.M4
Closes gh-9132
2017-05-09 08:52:29 +02:00
Stephane Nicoll
70a3daa266 Merge branch '1.5.x' 2017-05-09 08:35:18 +02:00
Stephane Nicoll
bca96932af Merge pull request #9072 from helpermethod:master
* pr/9072:
  Add Membrane Spring Boot Starter
2017-05-09 08:35:04 +02:00
Oliver Weiler
31d4f3b638 Add Membrane Spring Boot Starter
Closes gh-9072
2017-05-09 08:34:05 +02:00
Stephane Nicoll
3b0fb97081 Upgrade to Spring Framework 5.0.0.RC1
Closes gh-9129
2017-05-08 10:46:05 +02:00
Stephane Nicoll
3f58095192 Merge pull request #9103 from izeye:polish-20170505
* pr/9103:
  Polish
2017-05-07 10:36:52 +02:00
Johnny Lim
53e5d67cde Polish
Closes gh-9103
2017-05-07 10:32:12 +02:00
Stephane Nicoll
068c52b725 Merge branch '1.5.x' 2017-05-06 10:31:17 +02:00
Stephane Nicoll
85ae3082b8 Merge pull request #9116 from garyrussell:amqp15
* pr/9116:
  Upgrade to Spring Kafka 1.1.5.RELEASE
2017-05-06 10:30:58 +02:00
Gary Russell
74985b610b Upgrade to Spring Kafka 1.1.5.RELEASE
Closes gh-9116
2017-05-06 10:30:20 +02:00
Madhura Bhave
7c71fdd9ff Fix typo 2017-05-05 17:08:03 -07:00
Andy Wilkinson
6dd385898f Upgrade to Rxjava 1.3.0
Closes gh-9112
2017-05-05 14:33:14 +01:00
Stephane Nicoll
275bff39aa Remove deprecated code
Closes gh-8891
2017-05-05 14:32:09 +02:00
Andy Wilkinson
269cea291c Upgrade to Neo4j OGM 3.0.0-M01
Closes gh-8687
2017-05-05 11:40:29 +01:00
Stephane Nicoll
2245bced9f Merge pull request #9055 from garyrussell:GH-9041
* pr/9055:
  Remove deprecated spring.rabbitmq.listener.* properties
  Polish "Support direct AMQP container"
  Support direct AMQP container
2017-05-05 12:04:12 +02:00
Stephane Nicoll
1e9c1a68e4 Remove deprecated spring.rabbitmq.listener.* properties
See gh-9055, gh-9108
2017-05-05 12:03:21 +02:00
Stephane Nicoll
2894e57146 Polish "Support direct AMQP container"
Closes gh-9055
2017-05-05 11:32:25 +02:00
Gary Russell
6eddf1b372 Support direct AMQP container
Add support for auto configuration - select container type and separate
discrete properties.

See gh-9055
2017-05-05 10:08:13 +02:00