Commit Graph

5742 Commits

Author SHA1 Message Date
Stephane Nicoll
43b9a21283 Merge branch '1.2.x' 2015-08-29 08:01:49 +02:00
Stephane Nicoll
cd39e6a742 Upgrade to H2 1.4.188
Closes gh-3843
2015-08-29 08:01:00 +02:00
Stephane Nicoll
a3dea2149b Merge branch '1.2.x' 2015-08-28 16:52:00 +02:00
Stephane Nicoll
c04d00a2e9 Upgrade to H2 1.4.188
Closes gh-3843
2015-08-28 16:51:23 +02:00
Stephane Nicoll
60d7162270 Merge pull request #3844 from herau/master
* pr/3844:
  Fix sample links
2015-08-28 16:38:51 +02:00
herau
c379caadef Fix sample links
Closes gh-3844
2015-08-28 16:38:15 +02:00
Andy Wilkinson
bb92387928 Polishing 2015-08-27 17:42:02 +01:00
Rob Winch
34772e4177 Add Auto Configuration for SecurityEvaluationContextExtension
Fixes gh-3840
2015-08-27 11:11:38 -05:00
Stephane Nicoll
e9fe34e2fa Merge pull request #3818 from madorb/master
* pr/3818:
  Polish contribution
  Consistently apply table prefix
2015-08-27 16:32:46 +02:00
Stephane Nicoll
bd15a0c03a Polish contribution
Closes gh-3818
2015-08-27 15:19:46 +02:00
madorb
b69152571e Consistently apply table prefix
Make sure that if a custom table prefix is specified, it is set on the
JobRepository as well.

Closes gh-3798
2015-08-27 15:19:26 +02:00
Stephane Nicoll
19fe86169f Upgrade maven-enforcer-plugin to 1.4
Closes gh-3661
2015-08-27 14:55:04 +02:00
Stephane Nicoll
8aca174910 Upgrade version-maven-plugin to 2.1
Closes gh-3662
2015-08-27 14:53:50 +02:00
Stephane Nicoll
b3c2d1521f Merge pull request #3532 from izeye/metrics-20150717
* pr/3532:
  Make metric type more sensible
2015-08-27 14:18:36 +02:00
izeye
3ec97c1bb9 Make metric type more sensible
Closes gh-3532
2015-08-27 14:15:07 +02:00
Stephane Nicoll
2c619232b3 Add ComponentScan aliases on SpringBootApplication
Add aliases for `@ComponentScan`attributes on `@SpringBootApplication`
so that it is possible to customize how the component scan should be
applied on the project.

Previously, one would have to revert to `@EnableAutoConfiguration` to
achieve the same result.

Closes gh-3368
2015-08-27 14:12:01 +02:00
Eric Fenderbosch
ea4061fe99 Add AllNestedConditions and NoneOfNestedConditions
Fixes gh-2400
2015-08-27 12:00:59 +01:00
Stephane Nicoll
721b5a2395 Hazelcast auto-configuration
Provide a general purpose Hazelcast integration (i.e. not tied to caching).

Auto-configure a `HazelcastInstance` either based on the presence of a
`Config` bean or a configuration file. Said configuration file can be
specified explicitly or automatically found from default locations.

The cache integration already supports Hazelcast so it has been reworked
to automatically reuse an existing `HazelcastInstance` if available.

Closes gh-2942
2015-08-27 10:45:04 +02:00
Andy Wilkinson
35b2bca614 Merge branch 'gh-3703' 2015-08-27 09:34:05 +01:00
Andy Wilkinson
90668584c3 Polish contribution
Closes gh-3703
2015-08-27 09:33:50 +01:00
Rob Winch
868589366e Ensure that Spring Security Filter's order is configured
This commit ensures that even when a user specifies a
WebSecurityConfiguration that the order of Spring Security's Filter
is still configured.

Closes gh-3824
See gh-3703
2015-08-27 08:35:43 +01:00
Dave Syer
9dec0971d6 Change restart to fail if not running 2015-08-27 07:30:00 +01:00
Dave Syer
ff681adc5b Fix launch.script to not exit prematurely
Use "return" instead of "exit" where possible, especially in
function definitions.

Also fixed the exit codes to match the LSB spec for some specific
conditions (fixes gh-3521).

Fixes gh-3199, fixes gh-3535
2015-08-26 17:54:20 +01:00
Dave Syer
67483bb73c Only use Converters which are @ConfigurationPropertiesBinder qualified
Users sometimes create beans of type Converter and don't expect that to
automatically trigger a cascade of early initialization. This change adds
a qualifier to the Converters that are used by @ConfigurationProperties,
so they can be isolated (and simple).

Fixes gh-2669
2015-08-26 17:27:35 +01:00
Dave Syer
538afc4ab1 Make some methods in BasicErrorController protected
Spring MVC requires all handlers for the same path to be on the same handler
so if anyone wants to add new handlers for different content types they
have to copy a lot of code from BasicErrorController. This change increases
the visibility of the basic utility methods in BasicErrorController so that
custom handlers can be added easily.

Fixes gh-3828
2015-08-26 17:27:35 +01:00
Andy Wilkinson
a0870c1c4a Ignore binding failures for env vars and system properties
1.3.0.M4 tightened up the configuration property binding such that
ignoreUnknownFields = false now works as intended. Unfortunately, this
has led to some complaints as applications that worked with 1.2.x have
stopped working. For example, a SERVER_HOME environment variable does
not cause a failure in 1.2.x despite there being no home property on
ServerProperties but will now fail in 1.3.0.M4.

This commit updates RelaxedDataBinder to ignore binding failures for
properties that come from a source outside of the application’s control,
namely environment variables and system properties.

Closes gh-3775
2015-08-26 17:23:27 +01:00
Stephane Nicoll
d74d657372 Polish 2015-08-26 17:52:19 +02:00
Andy Wilkinson
2373e0fe66 Polishing
Remove stale test class
2015-08-26 16:08:09 +01:00
Andy Wilkinson
003268fb4e Add support for @WebFilter, @WebListener, @WebServlet
This commit adds a new annotation, @ServletComponentScan, that can be
used to enable scanning for @WebFilter, @WebListener, and @WebServlet
annotated classes. Registration beans will be automatically created for
any classes that are found, with the configuration derived from the
annotation.
2015-08-26 15:58:52 +01:00
Andy Wilkinson
07ec9bb849 Merge branch '1.2.x' 2015-08-26 15:02:45 +01:00
Andy Wilkinson
f143bd2cfb Upgrade to Tomcat 8.0.26
Closes gh-3406
Closes gh-3526
2015-08-26 15:01:29 +01:00
Andy Wilkinson
3b5dcc52ec Upgrade to Spring Integration 4.2.0.RC1
Closes gh-3827
2015-08-26 14:59:11 +01:00
Stephane Nicoll
d5f013a911 Merge pull request #3821 from stephane-deraco/patch-1
* pr/3821:
  Fix typo
2015-08-25 15:23:20 +02:00
Stéphane DERACO
a28c18a70a Fix typo
Closes gh-3821
2015-08-25 15:22:54 +02:00
Stephane Nicoll
efd1f6094a Merge branch '1.2.x' 2015-08-25 15:22:24 +02:00
Stephane Nicoll
6393569d42 Polish Externalized Configuration section
Closes gh-3823
2015-08-25 15:22:02 +02:00
Stephane Nicoll
63d157bb7c Favor JSR-107 provider if present
Previously, native cache libraries were favored over a standard JSR-107
implementation. If a user has a working setup using JCache with one
provider and switch to another provider, his setup may be broken if we
happen to provide a native support for the new provider.

We now consistently favor JSR-107 if it is present. Native support can
still be enabled via the `spring.cache.type` property.

Closes gh-3822
2015-08-25 15:07:24 +02:00
Stephane Nicoll
79b9bdec62 Merge pull request #3794 from htynkn/set-cache-period-to-zero
* pr/3794:
  Disable resource cache when DevTools is enabled
2015-08-24 10:54:26 +02:00
Huang YunKun
4e410681aa Disable resource cache when DevTools is enabled
Closes gh-3794
Closes gh-3739
2015-08-24 10:53:03 +02:00
Stephane Nicoll
5aa222a5dd Merge pull request #3810 from htynkn/patch-1
* pr/3810:
  Fix typo
2015-08-23 14:07:27 +02:00
Huang YunKun
9339136b54 Fix typo
Closes gh-3810
2015-08-23 14:07:13 +02:00
Stephane Nicoll
e7bf415427 Merge pull request #3809 from izeye/typo-20150822
* pr/3809:
  Fix typos
2015-08-23 09:26:23 +02:00
izeye
e2119d3329 Fix typos
Closes gh-3809
2015-08-23 09:24:00 +02:00
Stephane Nicoll
69fcae6b44 Merge pull request #3807 from htynkn/fix-sample-dependency
* pr/3807:
  Polish
  Fix springloaded version
2015-08-22 08:41:55 +02:00
Stephane Nicoll
1dfa1fc3a5 Polish
Closes gh-3800
2015-08-22 08:41:40 +02:00
Huang YunKun
3b81152ddc Fix springloaded version
Closes gh-3807
2015-08-22 08:41:30 +02:00
Dave Syer
ff8a4d0f9d Merge branch '1.0.x'
Conflicts: MessageSourceAutoConfiguration.java
2015-08-21 17:13:19 +01:00
Dave Syer
68b55adac0 Add search=CURRENT to MessageSourceAutoConfiguration
Fixes gh-3803
2015-08-21 15:44:01 +01:00
Dave Syer
089cda7af4 Add generated file to .gitignore 2015-08-21 15:31:20 +01:00
Dave Syer
2583f8050a Enable Tomcat RemoteIpValve by default
Fixes gh-3782
2015-08-21 09:26:05 +01:00