Commit Graph

7890 Commits

Author SHA1 Message Date
Ruben Dijkstra c84e09f611 Fix incorrect usage of Assert.notNull()
Closes gh-5931
2016-05-13 09:16:23 +02:00
Stephane Nicoll 075d5e8d12 Merge pull request #5936 from izeye:polish-20160513
* pr/5936:
  Polish
2016-05-13 08:56:08 +02:00
Johnny Lim 7a62b7d066 Polish
Closes gh-5936
2016-05-13 08:55:28 +02:00
Andy Wilkinson 0a124536df Merge pull request #5878 from Kazuki Shimizu
* gh-5878:
  Polish "Set default paths for fixed static version" (gh-5878)
  Set default paths for fixed static version
2016-05-12 17:08:08 +01:00
Andy Wilkinson 83573bf2c6 Polish "Set default paths for fixed static version" (gh-5878) 2016-05-12 17:07:23 +01:00
Kazuki Shimizu a4d9ba165f Set default paths for fixed static version
Closes gh-5878
2016-05-12 17:06:26 +01:00
Andy Wilkinson d15459b1bc Merge branch '1.3.x' 2016-05-12 16:58:45 +01:00
Andy Wilkinson 508905884a Fix String.format call in PropertiesConfigurationFactory
Closes gh-5921
2016-05-12 16:57:48 +01:00
Andy Wilkinson e561cc1997 Don't use a separate thread in the launcher to call app's main method
Using a separate thread to call the application's main method is
unnecessary – the context class loader of the current thread can be
updated instead – and makes exception and exit code handling more
complicated than it needs to be.

This commit updates the Launcher so that it calls the main method
runner using the current (main) thread. As a result, any exception
that's thrown will be caught by the JVM and result in a non-zero exit
code being returned from the process.

Closes gh-5922
2016-05-12 16:57:16 +01:00
Stephane Nicoll 221e4e8bbd Add missing dependency management
See gh-5711
2016-05-12 15:57:05 +02:00
Stephane Nicoll 69c2e0cd06 Add web-services starter
This commit deprecates the `ws` starter in favour of a new `web-services`
starter. A deprecation warning auto-configuration has also been added to
the ws starter.

Closes gh-5711
2016-05-12 15:49:29 +02:00
Stephane Nicoll 4c95039b59 Merge pull request #5925 from izeye:polish-20160512
* pr/5925:
  Polish
2016-05-12 07:55:45 +02:00
Johnny Lim 7c34dd87c1 Polish
Closes gh-5925
2016-05-12 07:55:19 +02:00
Stephane Nicoll afec397edd Merge pull request #5923 from garyrussell:si43RC1
* pr/5923:
  Upgrade to Spring Integration 4.3.0.RC1
2016-05-12 07:44:11 +02:00
Gary Russell 903cf1d9c3 Upgrade to Spring Integration 4.3.0.RC1
Closes gh-5923
2016-05-12 07:43:26 +02:00
Stephane Nicoll 812711a6a9 Merge pull request #5924 from eddumelendez:spring-session-1.2.0
* pr/5924:
  Upgrade to Spring Session 1.2.0.RELEASE
2016-05-12 07:37:00 +02:00
Eddú Meléndez d6e0714baf Upgrade to Spring Session 1.2.0.RELEASE
Closes gh-5924
2016-05-12 07:35:20 +02:00
Phillip Webb cdfbf28099 Allow @MockBean/@SpyBean on Spring AOP proxies
Update Mockito support so that AOP Proxies automatically get additional
`Advice` that allows them to work with Mockito. Prior to this commit a
call to `verify` would fail because exiting AOP advice would confuse
Mockito and an `UnfinishedVerificationException` would be thrown.

The `MockitoAopProxyTargetInterceptor` works by detecting calls to a
mock that have been proceeded by `verify()` and bypassing AOP to
directly call the mock.

The order that `@SpyBean` creation occurs has also been updated to
ensure that that the spy is created before AOP advice is applied.
Without this, the creation of a spy would fail because Mockito copies
'state' to the newly created spied instance. Unfortunately, in the case
of AOP proxies, 'state' includes cglib interceptor fields. This means
that Mockito's own interceptors are clobbered by Spring's AOP
interceptors.

Fixes gh-5837
2016-05-11 20:20:02 -07:00
Andy Wilkinson 500edeacc4 Ensure that static error pages have a Content-Type header
The getContentType() accessor method on View appears to only be used
for content negotiation. For the Content-Type header to be included in
the response the view needs to set it explicitly when render is called.

Closes gh-5918
2016-05-11 11:48:06 +01:00
Andy Wilkinson 5c0d400c23 Align Hibernate 5 join table names with those from SpringNamingStrategy
Previously, the name of a join table when using Hibernate 5 would
differ from those when using Hibernate 4 with the default
SpringNamingStrategy.

This commit introduces SpringImplicitNamingStrategy which customises the
name of join tables to match those produced by SpringNamingStrategy.

Closes gh-5880
2016-05-11 10:52:43 +01:00
Phillip Webb 1bb2c4fc00 Fixup test following dependency change
Since spring-boot-actuator-docs should not depend on a starter the log
file is now simulated.
2016-05-10 10:57:16 -07:00
Phillip Webb cf6212b955 Polish 2016-05-10 10:22:37 -07:00
Phillip Webb 6575ca6ff8 Merge branch 1.3.x 2016-05-10 09:35:49 -07:00
Phillip Webb 7fb545d26c Polish 2016-05-10 09:35:10 -07:00
Andy Wilkinson 46407c6763 Align JPA sample with Hibernate 5.1’s table naming
The name of the table for a many-to-many relationship has changed in
Hibernate 5.1.

This commit updates the JPA sample’s import.sql accordingly. It also
updates the repository integration tests to verify that the data has
been imported successfully.

Closes gh-5880
2016-05-10 17:29:23 +01:00
Andy Wilkinson 3ad334ed81 Merge pull request #5733 from Christian Flamm
* gh-5679:
  Update launch script to canonicalize jarfolder
2016-05-10 16:28:22 +01:00
Christian Flamm 6bbd50e084 Update launch script to canonicalize jarfolder
Previously, if the folder which contained the jar was a symlink the
launch script would use the symlinked folder's name when determining
the default identity.

This commit updates the launch script so that symlinks are resolved
and the canonical name of the folder which contains the jar is used
when determining the script's default identity. The behaviour when
APP_NAME has been set is unchanged.

Closes gh-5679
Closes gh-5733
2016-05-10 16:20:33 +01:00
Andy Wilkinson bc82751492 Merge pull request #5867 from Boris Waguia
* gh-5867:
  Add a test to verify that the console log pattern can be overridden
  Make it easier to override CONSOLE_LOG_PATTERN when including base.xml
2016-05-10 15:32:06 +01:00
Andy Wilkinson 1a45e30f37 Add a test to verify that the console log pattern can be overridden
See gh-5867
2016-05-10 15:30:05 +01:00
boriswaguia 7f7a109acb Make it easier to override CONSOLE_LOG_PATTERN when including base.xml
Previously, the CONSOLE_LOG_PATTERN property would always be set as
a result of base.xml including defaults.xml. This made it hard to
override the CONSOLE_LOG_PATTERN as it required a copy and paste of
the configuration.

This commit updates defaults.xml so that CONSOLE_LOG_PATTERN is only
set if it has not already been set. This reduces the configuration to
customize the console log pattern to a handful of lines.

Closes gh-5632
Closes gh-5867
2016-05-10 15:26:26 +01:00
Andy Wilkinson 172d427553 Merge pull request #5913 from Johnny Lim
* gh-5913:
  Polish
2016-05-10 14:48:59 +01:00
Johnny Lim 38dc9ec441 Polish 2016-05-10 14:48:42 +01:00
Andy Wilkinson c71f562001 Provide dependency management for more of Apache Artemis
Previously, dependency management was provided for artemis-jms-client
and artemis-jms-server, but none of the other Artermis modules upon
which they depend. This made it possible for a mixture of versions
to end up on the classpath.

This commit adds dependency management for all of the Artemis modules
upon which artemis-jms-client and artemis-jms-server depends. It also
adds dependency management for artermis-amqp-protocol as proposed
in gh-5818

Closes gh-5818
Closes gh-5914
2016-05-10 14:42:57 +01:00
Andy Wilkinson b98853d8dd Merge pull request #5803 from Grzegorz Poznachowski
* gh-5803:
  Apply standard Jackson2ObjectMapperBuilder config via a customizer
  Make it easier to customize auto-configured Jackson2ObjectMapperBuilder
2016-05-10 14:28:24 +01:00
Andy Wilkinson 0c2ecb7ba0 Apply standard Jackson2ObjectMapperBuilder config via a customizer
This commit builds on the new abstraction introduced in 2a0b8a7 by
applying the standard JacksonProperties-based
Jackson2ObjectMapperBuilder configuration via a customizer.

It also applies some polishing to the original contribution:

 - Code has been formatted
 - Logic that applies the customizers has moved to be alongside the code
   that creates the builder
 - Logic that explicitly sorted the customisers has been removed as
   they will be sorted automatically prior to injection
2016-05-10 14:23:33 +01:00
dziesio deb7529a36 Make it easier to customize auto-configured Jackson2ObjectMapperBuilder
Previously, it was difficult to customize the auto-configured
Jackson2ObjectMapperBuilder. Typically, use of a bean post processor
was required.

This commit introduces Jackson2ObjectMapperBuilderCustomizer. Beans
that implement this interfaces are called during creation of the
auto-configured Jackson2ObjectMapperBuilder, providing an opportunity
to customize its configuration.

Closes gh-5803
2016-05-10 14:23:33 +01:00
Andy Wilkinson 64e668d584 Use AssertJ in JooqExceptionTranslatorTests 2016-05-10 14:22:01 +01:00
Andy Wilkinson 12215533a5 Merge branch '1.3.x' 2016-05-10 13:29:17 +01:00
Andy Wilkinson aab65c8fcc Merge pull request #5884 from tfeiner
* gh-5884:
  Add tests for JooqExceptionTranslator
  Use JOOQ's Spring DB name during exception translation
2016-05-10 13:28:51 +01:00
Andy Wilkinson 1ab835a0f7 Add tests for JooqExceptionTranslator
See gh-5884
2016-05-10 13:21:59 +01:00
tfeiner 61cb18a69c Use JOOQ's Spring DB name during exception translation
The name of a JOOQ SQLDialect does not always match the name defined
in sql-error-codes.xml. For example, the Postgres translator was not
initialized correctly because in JOOQ the dialect is named
SQLDialect.POSTGRES, but in sql-error-codes.xml the bean is named
"PostgreSQL".

This commit updates the translator to use the dialects third-party
springDbName which ensures that it maps correctly to the entries in
sql-error-codes.xml.

Closes gh-5884
2016-05-10 13:21:59 +01:00
Andy Wilkinson f76b4483ee Merge pull request #5900 from Johnny Lim
* gh-5900:
  Upgrade to Jackson 2.7.4
2016-05-10 11:07:07 +01:00
Johnny Lim 7d4e3e36e1 Upgrade to Jackson 2.7.4
Closes gh-5900
2016-05-10 11:06:51 +01:00
Andy Wilkinson de0bcaa50e Update WebMvcTest to auto-configure supported template engines
Closes gh-5801
2016-05-10 10:41:38 +01:00
Andy Wilkinson c1a2a77cbe Auto-configure Flyway and Liquibase when using DataJpaTest
Closes gh-5716
2016-05-10 10:13:17 +01:00
Andy Wilkinson 0a765e36f1 Protect against stack overflow when searching meta annotations
It is legal for an annotation to be annotated with itself. Previously,
when searching for meta annotations this could lead to a stack overflow.
This was likely to occur when using Kotlin as, like Java, its Target
annotation is annotated with itself. A stack overflow doesn’t occur
with Java’s Target annotation due to some short-circuiting logic for
annotations in java.lang.

This commit updates the logic for finding meta-annotations to
short-circuit when an annotation that has already been seen is
encountered.

Closes gh-5902
2016-05-10 09:39:55 +01:00
Stephane Nicoll 699d083cec Add load-on-startup property to DispatcherServlet
Closes gh-2481
2016-05-10 08:37:23 +02:00
Stephane Nicoll dc35367453 Merge branch '1.3.x' 2016-05-10 08:04:47 +02:00
Stephane Nicoll 8cbbb577a0 Fixup version numbers following release 2016-05-10 08:04:41 +02:00
Stephane Nicoll 9e60340c0e Upgrade to EhCache 3.0.1
Closes gh-5898
2016-05-10 07:33:39 +02:00