Commit Graph

27490 Commits

Author SHA1 Message Date
Andy Wilkinson
1752773815 Default JSON loading to UTF-8 and provide methods to configure charset
Closes gh-6597
2016-08-16 15:17:30 +01:00
Andy Wilkinson
6d78066a3a Ensure that AWTError from image banner does not prevent app starting
Closes gh-6617
2016-08-16 15:05:00 +01:00
Andy Wilkinson
5f7e966955 Enable MessageSourceAutoConfiguration when using @WebMvcTest
Closes gh-6608
2016-08-16 14:35:06 +01:00
Andy Wilkinson
9d178a1547 Merge pull request #6588 from Nick Pillitteri
* gh-6588:
  Polish “Allow injection of StatsDClient into StatsdMetricWriter”
  Allow injection of StatsDClient into StatsdMetricWriter
2016-08-16 14:09:18 +01:00
Andy Wilkinson
13a9bc0537 Polish “Allow injection of StatsDClient into StatsdMetricWriter”
Closes gh-6588
2016-08-16 13:25:16 +01:00
Nick Pillitteri
63085fb441 Allow injection of StatsDClient into StatsdMetricWriter
Allow an instance of StatsDClient to be injected into the StatsdMetricWriter
which is used for exporting metrics to a Statsd server. This new constructor
allows the client to be injected but does not change the default behavior of
the writer.
2016-08-16 13:23:25 +01:00
Andy Wilkinson
49202570e9 Update SpringApplicationBuilder example in the docs and test it
Closes gh-6488
2016-08-16 13:14:56 +01:00
Andy Wilkinson
05fc967335 Update FilteredClassPathRunner so that JUnit rules work
Previously, the tests class and any JUnit annotations it contained were
loaded by a different class loader to JUnit. This meant that the JUnit
annotations were loaded twice and @Rule-annotated fields were not found.
This commit updates FitleredClassPathRunner to use a custom class loader
that ensures that any org.junit.* classes are only loaded by a single
class loader.
2016-08-16 13:06:57 +01:00
Andy Wilkinson
df4ef3e1cb Merge branch '1.3.x' 2016-08-15 13:47:32 +01:00
Andy Wilkinson
ffc0dc44ed Make Flyway and Liquibase endpoints conditional on a single candidate
Previously, auto-configuration of the Flyway and Liquibase endpoints
would fail if there were multiple Flyway or Spring Liquibase beans
in the application context.

This commit updates them so that they are now conditional on a single
candidate.

Closes gh-6609
2016-08-15 13:43:03 +01:00
Andy Wilkinson
a96af05882 Update Shade Plugin’s spring-boot-maven-plugin dependency during prepare
See gh-6527
2016-08-15 12:25:25 +01:00
Andy Wilkinson
5ad09333f3 Update Shade Plugin’s spring-boot-maven-plugin dependency version 2016-08-15 12:23:01 +01:00
Andy Wilkinson
b3e0b3a542 Consider mvn spring-boot:run that exits with 130 (SIGINT) to be successful
Previously, if mvn spring-boot:run with a forked JVM was killed with 
CTRL+C, the run would be considered unsuccessful. This commits updates
the run mojo to consider a forked JVM that exists with 130 (the exit
code produced when exiting due to SIGINT which is what CTRL+C sends) to
be successful.

Closes gh-6498
2016-08-15 11:23:49 +01:00
Stephane Nicoll
79b0d14504 Fix wrong use of slf4j
Closes gh-6650
2016-08-15 11:44:57 +02:00
Stephane Nicoll
7e09d09355 Merge pull request #6644 from eddumelendez:spring-security-4.1.2
* pr/6644:
  Upgrade to Spring Security 4.1.2.RELEASE
2016-08-14 08:07:38 +02:00
Eddú Meléndez
4e0591a5b0 Upgrade to Spring Security 4.1.2.RELEASE
Closes gh-6644
2016-08-14 08:07:13 +02:00
Stephane Nicoll
2d1e85c2fc Merge pull request #6540 from eddumelendez:health-endpoint-visibility
* pr/6540:
  Polish contribution
  Fix health endpoint security
2016-08-13 08:02:56 +02:00
Stephane Nicoll
4882544c84 Polish contribution
Closes gh-6540
2016-08-13 08:02:04 +02:00
Eddú Meléndez
dced154f71 Fix health endpoint security
Commit b02aba4 has renamed `management.security.role` to
`management.security.roles`. Unfortunately, the `HealthMvcEndpoint`
was still looking at the old property.

This commit makes sure that the proper key is used and any custom
role is applied rather than an unconditional `ADMIN` role.

See gh-6540
2016-08-13 07:26:41 +02:00
Andy Wilkinson
42291659db Merge branch '1.3.x' 2016-08-12 13:24:23 +01:00
Andy Wilkinson
a240fbae0d Merge pull request #6623 from Nick Pillitteri
* gh-6623:
  Use 'travis_wait' to prevent Travis CI from aborting builds
2016-08-12 13:24:13 +01:00
Nick Pillitteri
45d3f002f5 Use 'travis_wait' to prevent Travis CI from aborting builds
Builds use the '-q' flag to suppress most output due to a limit of 4MB
of logs on Travis CI. However, Travis will also abort builds that
don't generate any output for 10 minutes. Thus we also use the
'travis_wait' function to make sure builds aren't aborted for up to
30 minutes.

Fixes gh-6621
Closes gh-6623
2016-08-12 13:23:48 +01:00
Andy Wilkinson
c542d87c61 Verify that @FlywayDataSource is preferred over any "normal" DataSource 2016-08-12 13:17:09 +01:00
Andy Wilkinson
d41d732172 Merge pull request #6604 from Eddú Meléndez
* gh-6604:
  Ensure that @LiquibaseDataSource is preferred to “normal” DataSource
  Allow a DataSource to be marked as being specifically for Liquibase
2016-08-12 13:15:14 +01:00
Andy Wilkinson
7c54c3ff21 Ensure that @LiquibaseDataSource is preferred to “normal” DataSource
Closes gh-6604
2016-08-12 13:13:57 +01:00
Eddú Meléndez
8424965a10 Allow a DataSource to be marked as being specifically for Liquibase
This commit allows to configure a special DataSource to be used by
Liquibase by annotating it with @LiquibaseDataSource.

Closes gh-6614
2016-08-12 13:11:37 +01:00
Andy Wilkinson
11ccc5785c Merge branch '1.3.x' 2016-08-12 12:08:25 +01:00
Andy Wilkinson
ae6182a964 Update requiresUnpack documentation of unpack location
The unpack location is (largely) an implementation detail and the
Repackage Mojo was the only place where it was explicity documented.
Rather than updating the outdated location, this commit removes it
entirely to avoid encouraging people to rely on the location.

Closes gh-6624
2016-08-12 12:07:47 +01:00
Andy Wilkinson
ec9549f01f Downgrade to Jackson 2.7.6 and verify Elasticsearch’s compatibility
Closes gh-6508
2016-08-12 11:49:45 +01:00
Stephane Nicoll
0e1ca846c5 Merge pull request #6556 from rajadileepkolli:master
* pr/6556:
  Upgrade to Elasticsearch 2.3.5
2016-08-12 11:36:55 +02:00
Raja Dilip Kolli
4e0b581453 Upgrade to Elasticsearch 2.3.5
Closes gh-6556
2016-08-12 11:36:17 +02:00
Andy Wilkinson
b47da0d265 Fix spellcheck warning introduced in 6bbd50e0
Closes gh-6628
2016-08-11 20:35:47 +01:00
Andy Wilkinson
8c106af384 Allow default value for CONF_FOLDER to be set at build time
Closes gh-6549
2016-08-11 20:25:59 +01:00
Andy Wilkinson
1d58247ecc Merge branch '1.3.x' 2016-08-11 16:12:42 +01:00
Phillip Webb
a49f309ec1 Call afterProperties set in LogFileMvcEndpoint
Call afterPropertiesSet on the delegate `ResourceHttpRequestHandler`
to prevent an NPE. This change is required for compatibility with
Spring Framework 4.3 following SPR-13834.

Closes gh-6592
2016-08-11 16:11:29 +01:00
Andy Wilkinson
270530c4fd Fix class loading problems when CLI extensions are installed
Previously, CLI extensions where installed into the CLI's lib
directory which meant that they were on the class path of the app
class loader. Following the change to an executable jar's packaging,
this meant that they could not see classes in the CLI and a
ClassNotFoundException would result.

This commit updates the CLI to install extensions into lib/ext and
load commands using a new ClassLoader that has all of the jars in
lib/ext on its class path and that uses the launch class loader as
its parent.

Closes gh-6615
2016-08-11 16:01:18 +01:00
Andy Wilkinson
b2420be886 Load FailureAnalyzers defensively
Previously, if a single FailureAnalyzer failed to load, no failure
analysis would be performed. This commit updates FailureAnalyzers to
load the analysers defensively so that all but the problematic analyzer
are used for analysis.

Closes gh-6606
2016-08-10 17:36:00 +01:00
Andy Wilkinson
22ac6bcb2d Break GaugeWriter dependency cycle in MetricExportAutoConfiguration
Previously, MetricExportAutoConfiguration consumed
ExportMetricWriter-annotated GaugeWriter beans in its constructor and
also produced such a bean from one of its @Bean methods. This cycle
caused a BeanCurrentlyInCreationException to be thrown when the
bean method was active (the spring.metrics.export.statsd.host property
was set).

This commit break the cycle by moving the bean method into a separate,
nested configuration class. It also updates the existing test for
auto-configuration of a Statsd writer to catch any possible cycles
and to verify that the writer has be registered with the
MetricsExporter.

Closes gh-6544
2016-08-10 14:54:42 +01:00
Andy Wilkinson
899b851c6f Remove META-INF/INDEX.LIST when repackaging a jar file
META-INF/INDEX.LIST files are pointless in an executable jar and
moving application classes from the root of the jar to
BOOT-INF/classes breaks the index, resulting in an
InvalidJarIndexException being thrown.

This commit updates the Repackager to automatically remove a
META-INF/INDEX.LIST file from a jar file that is being repackaged.

Closes gh-6601
2016-08-10 13:23:49 +01:00
Andy Wilkinson
f4985abf3c Use factoryBeanObjectType attribute to find factory bean to replace
Previously, MockitoPostProcessor would fail to replace a factory bean
with a mock if the factory bean didn't return a matching type from
getObjectType(). This prevented Spring Data respoitories from being
replaced with a mock as Spring Data's repository factory beans
generally do not know the specific repository type that they will
produce when MockPostProcesser (a bean factory post-processor) is
running.

Spring Data has been updated to add a factoryBeanObjectType attribute
to its factory bean definitions. MockitoPostProcessor has been updated
to look for FactoryBeans with this attribute and to use its value
to determine whether or not the factory bean produces a bean of the
required type and, therefore, should be replaced with a mock.

Closes gh-6541
2016-08-10 10:27:00 +01:00
Stephane Nicoll
5fcadcee6e Polish documentation
Closes gh-6576
2016-08-10 10:27:10 +02:00
Stephane Nicoll
45bc63a725 Merge pull request #6589 from drumonii:doc-webjar-locator-jboss
* pr/6589:
  Document webjar-locator usage with JBoss
2016-08-10 09:49:01 +02:00
drumonii
80b5789d46 Document webjar-locator usage with JBoss
Closes gh-6589
2016-08-10 09:48:47 +02:00
Stephane Nicoll
fc636c1db7 Merge pull request #6600 from nagarajasr:master
* pr/6600:
  Apply sytem properties on HttpClient
2016-08-10 09:24:33 +02:00
nagarajasr
0996615ac3 Apply sytem properties on HttpClient
Closes gh-6600
2016-08-10 09:24:02 +02:00
Stephane Nicoll
2a94e05775 Add a note about Jackson and Java6
See gh-6536
2016-08-09 18:37:20 +02:00
Andy Wilkinson
19cddd650d Merge branch '1.3.x' 2016-08-08 17:25:15 +01:00
Andy Wilkinson
cec6015f8a Cope with null server or management port when creating curie provider
Previously, a NullPointerException would occur if
endpoints.docs.curies.enabled was true and the default value was being
used for either server.port or management.port.

EndpointWebMvcHypermediaManagementContextConfiguration has been
restructured to ensure that the DocsMvcEndpoint bean is defined before
the condition on its existence is evaluated. Previously this was
dependant on the class’s bean methods being processed in a particular
ordering, something that would be ok when using ASM but would vary when
using reflection.

Closes gh-6584
2016-08-08 17:16:00 +01:00
Andy Wilkinson
a729d48bd3 Start building against Spring Data Hopper SR3 snapshots
Closes gh-6567
See gh-6583
2016-08-08 14:21:27 +01:00
Andy Wilkinson
1b42e1aaa3 Recommend setting spring.thymeleaf.mode: HTML when using Thymeleaf 3
Closes gh-6552
2016-08-08 10:40:01 +01:00