Commit Graph

2958 Commits

Author SHA1 Message Date
Phillip Webb
8a8b5d3aa7 Polish 2015-02-23 13:34:55 -08:00
Andy Wilkinson
df81b3145f Backport to 1.1.x the fix for gh-2474 (originally made in e42fa79f7) 2015-02-19 11:22:06 +00:00
Andy Wilkinson
8622e5db20 Apply f9816ea and 64e94f3 to 1.1.x
Fixes gh-2473
2015-02-19 10:38:40 +00:00
Andy Wilkinson
b29c5a3297 Upgrade to Groovy 2.3.10
Closes gh-2429
2015-02-18 16:54:31 +00:00
Andy Wilkinson
11e0444814 Upgrade to Spring Security JWT 1.0.3.RELEASE
Closes gh-2304
2015-02-17 09:56:15 +00:00
Andy Wilkinson
99a0661565 Upgrade to Spring Batch 3.0.3.RELEASE
Closes gh-2503
2015-02-17 09:55:47 +00:00
Andy Wilkinson
4840417cd9 Upgrade to mongo-java-driver 2.12.5
Closes gh-2502
2015-02-17 09:55:16 +00:00
Andy Wilkinson
3b8c9418b1 Upgrade to JDom 2.0.6
Closes gh-2501
2015-02-17 09:54:51 +00:00
Andy Wilkinson
8c534547c9 Upgrade to Groovy 2.3.9
Closes gh-2500
2015-02-17 09:54:26 +00:00
Andy Wilkinson
cdc2008146 Upgrade to AspectJ 1.8.5
Closes gh-2499
2015-02-17 09:54:01 +00:00
Andy Wilkinson
3f285d1bf0 Upgrade to Tomcat 7.0.59
Closes gh-2498
2015-02-17 09:53:29 +00:00
Andy Wilkinson
6a93fa1dd0 Upgrade to Jackson 2.3.5
Closes gh-2497
2015-02-17 09:52:59 +00:00
Andy Wilkinson
d7ae0f3b06 Ensure that management endpoints with nested paths are secured
Previously each endpoint was secured for path, path/, and path.*.
This meant that a request to path/foo was not secured. This commit
secures path/** to ensure that requests to a nested endpoint path are
also secured.

Fixes gh-2476
2015-02-12 17:50:38 +00:00
Andy Wilkinson
6aaa5ee933 Upgrade to CRaSH 1.3.1
Closes gh-2425
2015-02-09 10:17:34 +00:00
Andy Wilkinson
9212574191 Upgrade to Spring AMQP 1.3.9.RELEASE
Closes gh-2453
2015-02-04 18:11:39 +00:00
Phillip Webb
555827cad7 Polish 2015-02-01 20:00:11 -08:00
Stephane Nicoll
d64cc082db Harmonize property name
The property default format is lower case using hyphen. The JMX default
domain property has been harmonized to that format.

Fixes gh-2427
2015-01-29 16:42:24 +01:00
Andy Wilkinson
c346e996ed Ignore temporary .writing files when finding output files
Spring Integration's FileWritingMessageHandler uses a .writing file
while it's in the process of writing a message to disk and then
performs a rename (depending on the OS and filesystem this may or may
not be atommic) to create the .msg file. Prior to this commit the
test was finding the temporary .writing files and examining them. This
could lead to a FileNotFoundException being thrown as the temporary
file was deleted while the test was trying to read its contents.

This commit updates the test to only look for files with a .msg suffix

Fixes gh-2428
2015-01-29 13:32:01 +00:00
Andy Wilkinson
c3020e9eff Add a single how to for creating a deployable war file
This commit updates the documentation to describe the three steps
involved in producing a deployable war file in a single place.

Closes gh-2185
2015-01-29 12:42:41 +00:00
Andy Wilkinson
b2a059a385 Upgrade to Spring Data Dijkstra SR5
Closes gh-2423
2015-01-29 10:28:16 +00:00
Stephane Nicoll
389b8641b7 Fix documentation inconsistency
Closes gh-2416
2015-01-28 15:43:30 +01:00
Stephane Nicoll
e70c18d05b Fix name of solr health indicator
Fixes gh-2410
2015-01-26 03:27:53 +01:00
Andy Wilkinson
93b2a17fb8 Make repackage depend on jar tasks from runtime project dependencies
By default, when building a project's jar its runtime dependencies
are not taken into account as they are not needed to successfully
compile the code that will be packaged in the jar. A side-effect of
this was that, if a project that was being repackaged had a runtime
dependency on another project, then the repackaged jar would not
include the jar of the project on which it has the runtime dependency
as the jar had not been built.

This commit updates Boot's repackage task to have a dependency on the
jar task of any project dependencies in the runtime configuration
thereby ensuring that those dependencies' jars will have been built
before the repackaging occurs.

Fixes gh-2344
2015-01-21 15:02:10 +00:00
Andy Wilkinson
bbd2486c04 Run invoker plugin with a single thread to avoid build failures
Running the invoker plugin with multiple threads against an empty
Maven cache results in strange build failures where Maven claims that
it cannot find a jar or pom file for an artifact that it should be
able to find. It would appear that Maven is unable to cope with
concurrent writes to its cache.

This commit removes the usage of multiple threads that was introduced
in 4e907f1.

Fixes gh-2389
2015-01-21 13:19:52 +00:00
Dave Syer
4e907f19ce Carefully add nested archives from JAR in PropertiesLauncher
If user runs an executable archive then it and its lib directory will be
on the classpath. Entries from loader.path take precedence in a way that
should make sense to users (earlier wins like in CLASSPATH env var).

Also added new integration tests to verify the behaviour (big improvement
on the old ones, which probably aought to be beefed up to the same
standard).

Fixes gh-2314
2015-01-20 17:37:49 +00:00
Andy Wilkinson
c857f957fa Correct syntax for thread name formatting in Logback XML configuration
See gh-2366
2015-01-20 11:51:54 +00:00
Andy Wilkinson
f10c9b5312 Avoid race between file creation and its contents being written
Previously, SampleIntegrationParentApplicationTests assumed that when
an output file existed on disk its contents would have been written
in their entirety. This assumption does not hold true and causes the
test to fail intermittently as it incorrectly determines that the test
has produced no output.

This commit updates the test to wait for up to 30 seconds for the
output files to appear on disk and for the expected content to be
found in one of those files. If the files exist but do not
contain the expected content the test will keep trying until it does
or until too much time as elapsed.

Fixes gh-2380
2015-01-20 09:50:35 +00:00
Dave Syer
b3597107ba More careful masking for the HTTP status in non-error cases
The ErrorPageFilter exposes a wrapped response to the downstream
chain and unless more care is taken the chain will be able to
set the response status, but not inspect it.

Fixes gh-2367
2015-01-16 11:29:00 +00:00
Andy Wilkinson
a51ad5c684 Update Eclipse template copyright date to 2015 2015-01-15 09:52:10 +00:00
Andy Wilkinson
376de01636 Don't remove @GrabResolver in JarCommand, disable initClass instead
Previously, JarCommand removed all @GrabResolver annotations in an
AST transformation. This was being performed as custom resolver
configuration is not necessary in a jar as all of the dependencies are
available from the jar. Furthermore, leaving the annotations in place
caused a failure when the jar was run due to a missing Ivy dependency
that's required by Groovy's default GrapeEngine, GrapeIvy.

The removal of @GrabResolver annotations was being done before they
could be used by Groovy's GrabAnnotationTransformation to configure
the GrapeEngine's resolvers. This resulted in the annotations having
no effect such that a dependency that was only available from a
repository made available by @GrabResolver would fail to resolve if
it was not cached locally.

This commit updates the AST transformation to leave the @GrabResolver
annotations in place but to set their initClass attribute to false.
This allows the annotation to be used while the jar's being compiled,
but supresses the generation of the static initializer that adds the
custom resolver to the GrapeEngine when the compiled code's run via
java -jar.

Fixes gh-2330
2015-01-14 16:42:43 +00:00
Andy Wilkinson
9744d28299 Uninstall SLF4J’s Java logging bridge handler during shutdown
Previously, when LogbackLoggingSystem or Log4JLoggingSystem were
initialized during application start up, they would install SLF4J’s Java
logging bridge handler, however no corresponding uninstall was performed
during application shutdown. When deployed to a servlet container, where
the application’s lifecycle doesn’t match the JVM’s lifecycle, this lead
to a memory leak.

This commit updates LoggingSystem to introduce a new cleanUp method. An
empty implementation is provided to preserve backwards compatibility
with existing LoggingSystem subclasses. Both LogbackLoggingSystem and
Log4JLoggingSystem have been updated to implement cleanUp and uninstall
the SLF4J bridge handler. LoggingApplicationListener has been updated
to call LoggingSystem.cleanUp in response to a ContextClosedEvent.

Closes gh-2324
2015-01-14 14:37:58 +00:00
Andy Wilkinson
92c8b75a73 Upgrade to Spring Integration 4.0.6.RELEASE
Closes gh-2358
2015-01-14 11:39:03 +00:00
Andy Wilkinson
3ef768e76d Upgrade to Spring AMQP 1.3.8.RELEASE
Closes gh-2357
2015-01-14 11:38:45 +00:00
Andy Wilkinson
912060698d Upgrade to SLF4J 1.7.10
Closes gh-2336
2015-01-14 11:38:22 +00:00
Andy Wilkinson
ca1716e9d6 Upgrade to Hibernate 4.3.8
Closes gh-2335
2015-01-14 11:38:02 +00:00
Andy Wilkinson
b875a00ebd Tighten up conditions: a web application may not be using Spring MVC
Previously, some classes that were annotatated with
@ConditionalOnWebApplication assumed that, if the application was a
web application, Spring MVC (spring-webmvc) would be on the classpath.
If it was not, the application would fail to start, typically with an
error relating to WebMvcConfigurerAdapter being unavailable.

This commit updates the affected configuration classes and annotates
them with @ConditionalOnClass(WebMvcConfigurerAdapter.class) to
ensure that their auto-configuration only takes effect if its a web
application and Spring MVC is on the classpath.

Fixes gh-2345
2015-01-13 17:51:10 +00:00
Andy Wilkinson
ac1d0cab3b Prevent Gradle from pulling in groovy-all with the remote shell starter
Sadly, Gradle handle's exclusions differently to Maven even when it's
processing a Maven pom.

In this case groovy-all is pulled in via org.crashub:crash.shell where
we've excluded it. This is enough to prevent Maven from pulling in
groovy-all when you depend on the remote shell starter.
org.crashub:crash.shell is also pulled in as a transitive dependency
of a number of other dependencies and Gradle requires each of these
to also exclude groovy-all for it to actually be excluded.

This commit adds the additional exclusions that are required to make
Gradle's behaviour sane.

Fixes gh-2257
2015-01-07 17:50:36 +00:00
Phillip Webb
bd83aca63f Fix InMemoryAuditEventRepository search by date
Update InMemoryAuditEventRepository to consider the date when searching
for events. Also switch to a circular buffer implementation and update
the capacity to limit the total number of items rather than limiting
per principal.

Fixes gh-2291
2015-01-06 11:58:28 -08:00
Phillip Webb
0622b3e987 Fix documentation code example error
The "Customizing ConfigurableEmbeddedServletContainer directly"
section should use `HttpStatus.NOT_FOUND` and not `HttpStatus.404` in
the sample code.

Fixes gh-2258
2015-01-05 11:57:02 -08:00
Phillip Webb
20dbf4ab15 Remove duplicate jetty-util dependency
See gh-2180
2015-01-03 12:29:00 -08:00
Phillip Webb
67302db9e5 Add dependency management for all Jetty modules
Update spring-boot-dependencies to include all Jetty modules. The helps
to prevent issues when modules are pulled in transitively (for example
via solr).

Fixes gh-2180
2015-01-02 16:21:47 -08:00
Phillip Webb
7e771bb655 Fix ParentAwareNamingStrategy and JMX auto-config
Fix ParentAwareNamingStrategy to set ObjectName properties for the
'identity' and 'context' attributes. Also update JmxAutoConfiguration
to ensure that the ParentAwareNamingStrategy is created in each context
and that the `mbeanExporter` bean is created. Prior to this commit the
nested @EnableMBeanExport class always meant that the mbeanExporter
condition never matched.

Fixes gh-2243
2015-01-02 15:07:44 -08:00
Phillip Webb
c46478f97d Guard for multiple ContentNegotiatingViewResolvers
Update WebMvcAutoConfiguration to ensure than the viewResolver bean
is not created if a user defined ContentNegotiatingViewResolver bean
is defined.

Fixes gh-2269
2015-01-02 11:32:04 -08:00
Dave Syer
f4e12e96c6 Additional condition to protect Reactor 2.0 users
(cherry picked from 80d55c47)
Closes gh-2255
2014-12-30 15:39:13 -08:00
Russell Allen
fe83aed6b2 Grammar correction
Closes gh-2262
2014-12-30 14:24:13 -08:00
Stephane Nicoll
1567c00ef0 Upgrade to Spring Framework 4.0.9
Closes gh-2259
2014-12-30 16:33:49 +01:00
Phillip Webb
a0667ba4bb Polish docs 2014-12-28 12:10:44 -08:00
Stephane Nicoll
38594cd820 Remove unused code
Closes gh-2244
2014-12-28 10:51:53 +01:00
Stephane Nicoll
05e402295d Mention environment variables mapping in the guide
Closes gh-2234
2014-12-27 18:28:13 +01:00
Phillip Webb
96d479c3d9 Make RequestMappingHandlerMapping @Primary
Update WebMvcAutoConfiguration so that the RequestMappingHandlerMapping
bean is @Primary. Prior to this commit a NoUniqueBeanDefinitionException
would be thrown then using the MvcUriComponentsBuilder.

Fixes gh-2237
2014-12-26 11:42:10 -08:00