Commit Graph

7680 Commits

Author SHA1 Message Date
Phillip Webb
745a581552 Remove trailing whitespace 2016-04-25 11:56:48 -07:00
Stephane Nicoll
8778b53b32 Merge pull request #5790 from jangalinski/patch-1
* pr/5790:
  Add camunda bpm starter
2016-04-25 17:08:30 +02:00
Jan Galinski
b99ef3a435 Add camunda bpm starter
Closes gh-5790
2016-04-25 17:08:08 +02:00
Phillip Webb
93382648ab Formatting 2016-04-24 22:54:27 -07:00
Phillip Webb
79922360e1 Polish 2016-04-24 22:49:41 -07:00
Stephane Nicoll
d10d819ca5 Add reference to Mule ESB starter
Closes gh-2488
2016-04-24 06:46:57 +02:00
Stephane Nicoll
11f763ef89 Polish doc
Closes gh-789
2016-04-24 05:46:26 +02:00
Stephane Nicoll
eda7819d8b Fix typo 2016-04-24 05:42:11 +02:00
Stephane Nicoll
892c1a52f7 Merge pull request #5773 from fabriziocucci/patch-1
* pr/5773:
  Polish
  Removed redundant override of the configure method
2016-04-23 16:15:25 +02:00
Stephane Nicoll
f71a207a81 Polish 2016-04-23 16:15:17 +02:00
Fabrizio Cucci
3c901fef42 Removed redundant override of the configure method
Since the `SampleJerseyApplication` class is already passed in the
`SpringApplicationBuilder` constructor, there is no need to override the
configure method of the `SpringBootServletInitializer` class.

Closes gh-5773
2016-04-23 16:13:34 +02:00
Dave Syer
014883253a Merge remote-tracking branch 'origin/1.3.x' 2016-04-22 09:40:12 +01:00
Dave Syer
b9db4742ac Add metric flusher to export remaining metrics on shutdown
Before this change the app context closes and metrics that have not
yet been exported ccan be orphaned. The design of this feature is simple:
use Closeable where possible, so that it will be called automatically
by Spring on shutdown.

Fixes gh-5771
2016-04-22 09:33:18 +01:00
Dave Syer
de2c22efee Merge remote-tracking branch 'origin/1.3.x' 2016-04-21 14:09:59 +01:00
Dave Syer
de0f0ecce4 Align counter behaviour between metric exporters
The MetricCopyExporter has had the capability for a while to keep
track of counters internally. This change aligns that with the
PrefixMetricGroupExporter.

Fixes gh-5762
2016-04-21 14:02:29 +01:00
Andy Wilkinson
71e665ba87 Update the spring-boot-samples README
Closes gh-5748
2016-04-21 13:56:39 +01:00
Andy Wilkinson
266793458d Update issue template to describe what to do for different issue types
Closes gh-5519
2016-04-21 12:36:39 +01:00
Stephane Nicoll
8d1c93112b Merge pull request #5745 from mbenson/notprofilesyamldocfix
* pr/5745:
  Polish
2016-04-21 12:54:15 +02:00
Matt Benson
b9aee3678d Polish
See gh-4953
Closes gh-5745
2016-04-21 12:53:43 +02:00
Andy Wilkinson
3bfc6b1a4b Avoid packaging two versions of same dependency in Gradle repackaging
Previously, the Gradle plugin would include all of the dependencies
from both the compile and runtime configurations in the repackaged
jar. In the unlikely event that the compile and runtime configurations
contained different versions of the same dependency, this would lead
to both versions of the dependency being packaged in the jar file.

The runtime configuration extends the compile configuration so, in
normal circumstances, it will contain a superset of the compile
configuration's dependencies. In the situation described above where
the two configurations contain different versions of the same
dependency the runtime configuration will only contain whichever
version of the two dependencies has "won". By default, this will
be the dependency with the higher version.

This commit updates the Gradle plugin to only include the runtime
configuration's resolved dependencies during repackaging. As explained
above, the runtime configuration extends the compile configuration so
any compile dependencies will still be included, with the added
benefit that duplicate versions of the same dependency will have been
resolved to a single, preferred version.

Closes gh-5749
2016-04-21 11:37:40 +01:00
Andy Wilkinson
a6bcc6f573 Update Liquibase and Flyway docs and test other changelog formats
Closes gh-5741
2016-04-21 10:22:59 +01:00
Andy Wilkinson
b159bb8af8 Merge branch '1.3.x' 2016-04-21 09:57:35 +01:00
Andy Wilkinson
97934aaf82 Upgrade to Jetty 9.2.16.v20160414
Closes gh-5757
2016-04-21 09:55:46 +01:00
Andy Wilkinson
e748c5e6a0 Merge branch '1.3.x' 2016-04-20 17:47:45 +01:00
Andy Wilkinson
125483e7aa Add a note in the docs that default launch script only works on Linux
Closes gh-5446
2016-04-20 17:46:36 +01:00
Andy Wilkinson
addb69508d Perform analysis of failures caused by DataSourceBeanCreationException
Closes gh-5351
2016-04-20 17:34:44 +01:00
Andy Wilkinson
e1cea8a98c Perform failure analysis of BindExceptions
Closes gh-5738
2016-04-20 17:10:32 +01:00
Andy Wilkinson
aa19c19753 Merge branch '1.3.x' 2016-04-20 10:58:50 +01:00
Andy Wilkinson
7709543e67 Set web application context on ServletContext in plain web app tests
Previously, the web application context was only set on the
ServletContext in a full-blown integration test or when MockMvc was
used.

This commit updates SpringApplicationContextLoader so that the context
is also set on the context in a plain web application test (one where
MockMvc is not being used). The change is a partial backport of commit
7dffb702.

Closes gh-4370
2016-04-20 10:39:42 +01:00
Andy Wilkinson
596a54e5ca Upgrade Javassist to 3.20.0-GA
Closes gh-2953
2016-04-20 10:00:11 +01:00
Stephane Nicoll
2a6b1e69b6 Merge pull request #5720 from izeye/substring
* pr/5720:
  Remove the second parameter of substring() if possible
2016-04-20 09:19:12 +02:00
Johnny Lim
b914b4aa52 Remove the second parameter of substring() if possible
Closes gh-5720
2016-04-20 09:18:35 +02:00
Andy Wilkinson
58dac43b8d Update TraceWebFilterAutoConfiguration to use constructor injection 2016-04-19 16:25:49 +01:00
Andy Wilkinson
e69ec6bb09 Log classpath once environment has been prepared
Previously, the classpath would be logged in response to the
ApplicationStartedEvent. At this point, logging could be disabled
while the logging system is being initialized, or because the
log levels configured in the environment have not yet been applied.

This commit moves the logging to happen in response to an
ApplicationEnvironmentPreparedEvent by which point the logging
system has been initialized and its levels have been configured.

Closes gh-5313
2016-04-19 16:23:50 +01:00
Andy Wilkinson
601791c664 Configure test property sources before ConfigFileApplicationListener runs
Previously, SpringBootContextLoader configured the environment with the
test property sources using an ApplicationContextInitializer. This was
because TestPropertySourceUtils did not provide a method to directly
configure the environment using properties files, it had to be done
via an application context. An unwanted side-effect of this was that
the test property sources were not being configured before
ConfigFileApplicationListener examined the environment to determine the
name and locations of the files that it should be loading.

This commit takes advantage of a new method that was added to
TestPropertySourceUtils which allows properties files to be added
directly to the environment without using an application context. This
means that the use of the ApplicationContextInitializer can be removed
and the test property sources can be applied to the environment before
the application context is created.

Closes gh-5728
2016-04-19 13:30:18 +01:00
Stephane Nicoll
0cfcbeb40e Add dependency management for Ehcache 3
Closes gh-5725
2016-04-19 13:58:24 +02:00
Andy Wilkinson
96d01d6791 Merge branch '1.3.x' 2016-04-19 12:37:37 +01:00
Stephane Nicoll
0ea6fb3261 Improve error page documentation
Closes gh-5722
2016-04-19 13:17:23 +02:00
Andy Wilkinson
a19eeaf91d DevTools should only shut down single, auto-configured DataSource
Previously, there were two problems with DevTools’ DataSource
auto-configuration:

1. It did not tolerate a context with multiple DataSources
2. It would attempt to shut down a DataSource that had not been created
   by DataSourceAutoConfiguration and, therefore, where we could not be
   sure of its configuration.

This commit updates DevToolsDataSourceAutoConfiguration so that it backs
off unless the context contains DataSourceProperties and a single
DataSource created by DataSourceAutoConfiguration. This ensures that it
can safely use DataSourceProperties to get the DataSource’s
driver class name and accurately determine if it’s an in-memory or
external database. Shutdown is only called for an in-memory database.

Closes gh-5540
2016-04-19 11:41:21 +01:00
Stephane Nicoll
59f5e14b5f Merge pull request #5731 from izeye/polish-20160419
* pr/5731:
  Remove duplicate words
2016-04-19 08:22:13 +02:00
Johnny Lim
61b47079a4 Remove duplicate words
Closes gh-5731
2016-04-19 08:21:58 +02:00
Stephane Nicoll
6ebc8d213d Merge pull request #5727 from jmnarloch/string-builder
* pr/5727:
  Replacing StringBuffer with lock-free StringBuilder
2016-04-19 08:01:21 +02:00
Jakub Narloch
64989ae192 Replacing StringBuffer with lock-free StringBuilder
Closes gh-5727
2016-04-19 08:01:05 +02:00
Andy Wilkinson
1da9e4d80a Merge branch '1.3.x' 2016-04-18 17:42:44 +01:00
Andy Wilkinson
432969e61e Correct documented spring.factories key for management context config
Closes gh-5664
2016-04-18 17:41:44 +01:00
Andy Wilkinson
6d4083a718 Merge branch '1.3.x' 2016-04-18 17:32:47 +01:00
Andy Wilkinson
a4d7a77547 Apply spring.thymeleaf.cache to auto-configured ThymeleafViewResolver
Previously, spring.thymeleaf.cache was only applied to auto-configured
TemplateResolver. This commit also applies the propery to the
auto-configured ThymeleafViewResolver.

Closes gh-5395
2016-04-18 17:26:13 +01:00
Andy Wilkinson
13c01376b0 Merge branch '1.3.x' 2016-04-18 17:08:27 +01:00
Andy Wilkinson
9210029109 Record trace with response status of 500 following unhandled exception
Previously, if the filter chain threw an unhandled exception,
WebRequestTraceFilter would record a trace with a response status of
200. This occurred because response.getStatus() would return 200 as
the container had not yet caught the exception and mapped it to an
error response.

This commit updates WebRequestTraceFilter to align its behaviour with
MetricsFilter. It now assumes that the response status will be a 500
and only updates that to the status of the response if the call to the
filter chain returns successfully.

To avoid making a breaking change to the signature of the protected
enhanceTrace method, an HttpServletResponseWrapper is used to include
the correct status in the trace.

Closes gh-5331
2016-04-18 16:56:54 +01:00
Andy Wilkinson
b9d7a39693 Update sample-parent-context following changes to integration starter
See gh-5528
2016-04-18 15:36:33 +01:00