8714 Commits

Author SHA1 Message Date
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
Stephane Nicoll
38e3b36605 Merge pull request #6580 from vpavic:cxf-reference
* pr/6580:
  Polish contribution
  Add reference to Apache CXF integration
2016-08-08 09:50:24 +02:00
Stephane Nicoll
b4186e0c9d Polish contribution
Closes gh-6580
2016-08-08 09:50:08 +02:00
Vedran Pavic
98b4d00828 Add reference to Apache CXF integration
See gh-6580
2016-08-08 09:49:19 +02:00
Stephane Nicoll
3b4e4f175a Polish 2016-08-07 21:26:33 +02:00
Phillip Webb
f38bd7af37 Extract GSON/Jackson config to inner classes
Update JsonTestersAutoConfiguration so that GSON and Jackson specific
configuration are inner classes. This should prevent ClassNotFound
exception when the libraries are not on the classpath.

Fixes gh-6502
2016-08-02 15:14:30 -07:00
Stephane Nicoll
80a1897ccb Remove useless postgresql alias
See gh-6534
2016-08-02 15:06:02 -07:00
Stephane Nicoll
f07cb01012 Merge pull request #6492 from zhanhb:patch-1
* pr/6492:
  Fix `spring-boot-legacy` version
2016-08-02 14:23:15 -07:00
zhanhb
8d84123762 Fix spring-boot-legacy version
Closes gh-6492
2016-08-02 14:22:06 -07:00
Stephane Nicoll
a1ed7c5fed Merge pull request #6534 from vpavic:gh-6533
* pr/6534:
  Polish contribution
  Fix aliases for database names in `JdbcSessionDatabaseInitializer`
2016-08-02 14:19:46 -07:00
Stephane Nicoll
90c67daec1 Polish contribution
Closes gh-6534
2016-08-02 14:19:28 -07:00
Vedran Pavic
b5e2bff1a4 Fix aliases for database names in JdbcSessionDatabaseInitializer
See gh-6354
2016-08-02 14:18:38 -07:00
Stephane Nicoll
81094e4b23 Merge branch '1.3.x' 2016-08-01 13:49:49 -07:00
Stephane Nicoll
f186008d1f Fix Groovy version in INSTALL.txt
This commit uses maven filtering to set the Groovy version rather than an
hard-coded value that can be easily outdated.

Closes gh-6530
2016-08-01 13:49:28 -07:00
Stephane Nicoll
9cb95f423c Fix typo
Closes gh-6518
2016-07-31 07:33:51 -07:00
Stephane Nicoll
3f14bdc01d Add missing type condition on JdbcTemplateAutoConfiguration
Closes gh-6499
2016-07-29 14:23:12 +02:00
Brian Clozel
d62827373d Fix Bean Condition on GsonTester FactoryBean
This commit fixes the `@ConditionalOnClass` typo on the GsonTester
FactoryBean, which was testing for `ObjectMapper` instead of `Gson`.

This means that the next condition `@ConditionalOnBean(Gson.class)`
throws a `ClassNotFoundException: com.google.gson.Gson` since it's
trying to load that class to check for an existing Bean of that type.

Fixes gh-6502
2016-07-29 10:24:29 +02:00
Phillip Webb
c7a23eae56 Fixup version numbers following release 2016-07-28 14:38:17 -07:00
Spring Buildmaster
334baaeffd Next development version 2016-07-28 19:54:01 +00:00
Phillip Webb
405299a95a Generate empty spring-boot-docs jar
Update spring-boot-docs so that an empty jar file is produced. The
code is only needed for documentation includes and if included in the
deployed jar seems to prevent promotion to Maven Central.

Fixes gh-6495
2016-07-28 10:40:17 -07:00
Stephane Nicoll
9bb6b8a012 Upgrade to Spring Framework 4.3.2.RELEASE
Closes gh-6318
2016-07-28 11:49:56 +02:00
Stephane Nicoll
b214ed5eda Merge branch '1.3.x' 2016-07-28 11:47:22 +02:00
Stephane Nicoll
29cd3c42e1 Fixup version numbers following release 2016-07-28 11:46:55 +02:00
Spring Buildmaster
a89ef5df6e Next Development Version 2016-07-28 09:18:40 +00:00
Phillip Webb
d7e1ccc690 Improve configuration properties logging
Update ConfigurationPropertiesBindingPostProcessor with improved logging
when multiple PropertySourcesPlaceholderConfigurer beans are found.

See gh-6457
2016-07-27 18:12:29 -07:00
Phillip Webb
5d9836b3b1 Refine unmapped property support
Replace `@UnmappedPropertyValue` with a `skip` attribute on
`@PropertyMapping` so that any default attribute value can be skipped.

Closes gh-6455
2016-07-27 16:27:24 -07:00
Phillip Webb
ac1ad2a145 Polish 2016-07-27 16:27:11 -07:00