Commit Graph

10971 Commits

Author SHA1 Message Date
Dave Syer
a7da48e2a7 Add redis to travis build 2015-07-13 17:59:35 +01:00
Dave Syer
28edc95f18 Ensure Spring Session autoconfig creates ServerProperties carefully
Without this change there can be more than one ServerProperties in a
context with different names.

Fixes gh-3476
2015-07-13 17:28:15 +01:00
Andy Wilkinson
bbbf6f9872 Build against Spring Data Gosling snapshots
See gh-3288
2015-07-13 17:15:07 +01:00
Dave Syer
e5d3fa0c6c Merge remote-tracking branch '1.2.x' 2015-07-13 15:43:40 +01:00
Dave Syer
ff79138aa5 Alternative fix for Rabbit listener transactions
Never inject a transaction manager (user can create his own
"rabbitListenerContainerFactory" bean if he wants an actual
non-JTA transaction manager.

See gh-3432
2015-07-13 15:00:40 +01:00
Dave Syer
67933ab01f Add boolean flag spring.rabbit.listener.useTransactionManager
If set *and* there is a transaction manager in the context, then the
listener container created by Spring Boot will use the transaction
manager to execute the listeners.

Fixes gh-3432 (by virtue of not requiring a JtaTransactionManager any
more).
2015-07-13 14:21:18 +01:00
Dave Syer
f6c395d0a6 Add Maven incantation to make STS 3.7 happy 2015-07-13 14:00:44 +01:00
Stephane Nicoll
29ca159c17 Merge pull request #3473 from izeye/typo-20150713
* pr/3473:
  Fix typo
2015-07-13 14:59:28 +02:00
izeye
d06f3b1a25 Fix typo
Closes gh-3473
2015-07-13 14:59:15 +02:00
Dave Syer
d0cf6b534b Add 3xx redirects to the "unmapped" class of requests for metrics
When Spring Security sends 302 responses to a login page we don't get
any information about the request matching in Spring MVC. Consequently
apps can end up with a lot of counter.status.302.* metrics (where
"*" can be whatever the user sent).

This change treats 3xx the same as 4xx (if it is unmapped it just gets
added to a metric called "unmapped" instead of using the actual request
path).

Fixes gh-2563
2015-07-13 13:33:30 +01:00
Stephane Nicoll
7ba7693e65 Polish doc
See gh-3457
2015-07-13 13:48:13 +02:00
Stephane Nicoll
cb5eccb5c1 Add missing handle-as meta-data
Liquibase has a `changeLog` property that is definitely used as a
`Resource` but cannot be defined as such as the original String value
should be kept against an API we don't control.

Update the tests also to make it more clear that if hints are added
against a property that is detected automatically, said property still
keeps all its auto-discovered capabilities.

Closes gh-3457
2015-07-13 13:45:23 +02:00
Stephane Nicoll
d64ee99b20 Add configuration meta-data parser
Add a new `spring-boot-configuration-metadata` module that provides an
API to manipulate Spring Boot configuration meta-data. Can read meta-data
from arbitrary locations, though the standard
`META-INF/spring-configuration-metadata.json` location must be preferred.

Closes gh-1970
2015-07-13 11:53:31 +02:00
Andrew Landsverk
85621a34fb Fix typo in devtools doc
Closes gh-3463
2015-07-13 10:42:51 +01:00
Dave Syer
82da28f627 Add support for custom Exporter with declarative schedule 2015-07-13 10:11:33 +01:00
Andy Wilkinson
58509ed7c5 Merge branch '1.2.x' 2015-07-13 09:59:27 +01:00
Johannes Stelzer
fdb83ec338 Correct assertion for indicators parameter in CompositeHealthIndicator
Closes gh-3417
2015-07-13 09:58:33 +01:00
Andy Wilkinson
bd91b21bc9 Merge branch '1.2.x' 2015-07-13 09:55:49 +01:00
Roy Clarkson
27817b6733 Upgrade to Spring Mobile 1.1.5.RELEASE
Closes gh-3466
2015-07-13 09:55:14 +01:00
Stephane Nicoll
3d5f562dba Merge pull request #3467 from xueyumusic/typo
* pr/3467:
  Fix typo
2015-07-13 09:53:38 +02:00
xueyu
534eb29bde Fix typo
Closes gh-3467
2015-07-13 09:53:14 +02:00
Stephane Nicoll
9340491422 Merge pull request #3465 from izeye/patch-33
* pr/3465:
  Polish toString()
2015-07-13 09:52:49 +02:00
izeye
f85f316873 Polish toString()
Closes gh-3465
2015-07-13 09:52:29 +02:00
Stephane Nicoll
3664895f04 Polish 2015-07-12 09:20:12 +02:00
Phillip Webb
fd0b1c6332 Merge pull request #3363 from isopov/comnpression-excluded-useragents
* pr/3363:
  Add HTTP compression excludeUserAgents property
2015-07-10 16:32:01 -07:00
Ivan Sopov
5f25080091 Add HTTP compression excludeUserAgents property
Closes gh-3363
2015-07-10 16:31:55 -07:00
Phillip Webb
5e243b28db Merge pull request #3405 from rob-baily/logback-pattern-properties
* pr/3405:
  Support log pattern properties with logback
2015-07-10 15:23:52 -07:00
Rob Baily
177ea459f1 Support log pattern properties with logback
Update AbstractLoggingSystem to pass LoggingInitializationContext to
loadDefaults() method to enable access to the environment.
DefaultLogbackConfiguration now uses this to find log pattern overrides.

Fixes gh-3367
Closes gh-3405
2015-07-10 15:23:46 -07:00
Phillip Webb
1fab23c514 Merge pull request #3461 from meowy/patch-1
* pr/3461:
  Fix typo in jOOQ example code
2015-07-10 13:54:53 -07:00
Melvin Kicchi
3d83c6fcb2 Fix typo in jOOQ example code
Closes gh-3461
2015-07-10 13:54:00 -07:00
Phillip Webb
ee3de5f38a Add ApplicationRunner support to CLI
Add ApplicationRunner and ApplicationArguments to the CLI compiler
auto-configuration.

See gh-1990
2015-07-10 13:51:57 -07:00
Stephane Nicoll
1ce418cfdc Fix meta-data for logging.level property 2015-07-10 18:12:24 +02:00
Dave Syer
924b9f9dde Add Maven incantation to make STS 3.7 happy 2015-07-10 15:56:40 +01:00
Dave Syer
b2a2c5b168 Add Maven incantation to make STS 3.7 happy 2015-07-10 15:56:40 +01:00
Stephane Nicoll
1348acf3e3 Exclude freemarker from hazelcast
Hazelcast introduced a regression in their dependency management as of
3.5 which brings freemarker. This has unfortunate side effect in a Spring
Boot application since the freemarker auto-configuration kicks in for no
apparent reason when hazelcast is used.

An exclusion has been applied until the issue is fixed in hazelcast.

Closes gh-3418
2015-07-10 16:37:50 +02:00
Stephane Nicoll
8ff8afec7c Add "handle-as" hint provider
Replace the enum provider by a more general purpose provider that can
substitute the type of the property for the purpose of auto-completing
the values.

"handle-as" can be used for enums but for any type that the IDE
understands such as locale, charset, mime-type and Spring's resource
abstraction.

Closes gh-3457
2015-07-10 14:28:11 +02:00
Stephane Nicoll
f6f74e1aef Polish 2015-07-10 10:48:47 +02:00
Spring Buildmaster
57f26c6bfc Next development version 2015-07-09 17:30:48 -07:00
Phillip Webb
8280004f80 Fix ClasspathLoggingApplicationListener order
Commit 3de25164 inadvertently caused early debug logging from the
ClasspathLoggingApplicationListener. We now set its order relative
to the LoggingApplicationListener.

See gh-2543
2015-07-09 16:51:19 -07:00
Phillip Webb
eeb947b382 Polish docs 2015-07-09 12:56:03 -07:00
Phillip Webb
e3b59774c8 Merge branch '1.2.x' 2015-07-09 10:37:30 -07:00
Phillip Webb
4b17f3ceef Formatting 2015-07-09 10:37:21 -07:00
Phillip Webb
67f7079cb2 Formatting 2015-07-09 10:18:05 -07:00
Stephane Nicoll
e344eece99 Remove hint for server.tomcat.compression
server.tomcat.compression has been removed in 00d594d so the hint for it
is no longer relevant.
2015-07-09 17:50:26 +02:00
Andy Wilkinson
a2d58030dd Merge branch '1.2.x' 2015-07-09 16:42:37 +01:00
Andy Wilkinson
68e54e1d5d Favour entries in source jar over standard libraries when repackaging
When writing a jar, once an entry has been written it will never be
overwritten, i.e. the first write of a given entry will win. Previously,
when repackaging a jar, the existing contents were written followed by
any libraries. This caused a problem when repackaged a WAR file and
a library needed to be unpacked as the existing entry in WEB-INF/lib
would prevent the library with the UNPACK comment from being written.
This was addressed in f761916b by inverting the order so libraries
would take precedence over entries in the source jar.

It’s now become apparent that this change in the order causes a problem
for users who are obfuscating their code. The obfuscated code exists in
the source jar but is also provided to the repackager in its original
form as a library. When libraries take precedence, this means that the
code in its original form ends up in the repackaged war and the
obfuscation is lost.

This commit updates the repackager to write libraries that require
unpacking first. This allows the UNPACK comment to be written even if
there’s also a source entry for the library. Next, source entries are
written. This allows obfuscated source entries to take precedence over
any unobfuscated library equivalents. Lastly, standard libraries that
do not require unpacking are written into the repackaged archive.

Closes gh-3444
2015-07-09 16:37:10 +01:00
Stephane Nicoll
cf1c0cd04c Polish 2015-07-09 14:57:45 +02:00
Stephane Nicoll
c5ae68a1ec Clarify enum provider purpose 2015-07-09 14:38:48 +02:00
Stephane Nicoll
97634e85ac Remove unnecessary keyword 2015-07-09 14:33:01 +02:00
Stephane Nicoll
f34508ff8a Remove outdated key
The `spring.metrics.export.redis.aggregate-key-pattern` is no longer
defined but was still referenced in the documentation.
2015-07-09 10:46:05 +02:00