Commit Graph

2148 Commits

Author SHA1 Message Date
Stephane Nicoll
9ea4fce03e Merge branch '2.0.x' 2018-05-16 09:29:02 +02:00
Johnny Lim
652bbf4ab2 Polish DefaultErrorWebExceptionHandler.renderErrorView()
Closes gh-13174
2018-05-16 09:28:26 +02:00
Andy Wilkinson
38b491018c Upgrade to Solr 7.2.1
Closes gh-13182
2018-05-15 17:22:27 +01:00
Andy Wilkinson
b5185fbe10 Upgrade to Lettuce 5.1.0.M1
Closes gh-13181
2018-05-15 17:22:26 +01:00
Andy Wilkinson
148997fd43 Upgrade to Elasticsearch 6.2.4
Closes gh-13178
2018-05-15 17:11:28 +01:00
Andy Wilkinson
795ff45a65 Upgrade to Cassandra Java Driver 3.5.0
Closes gh-13177
2018-05-15 16:57:51 +01:00
Andy Wilkinson
150a19523c Start building against Spring Data Lovelace M3 snapshots
See gh-13169
2018-05-15 16:57:51 +01:00
Andy Wilkinson
33fadda4d9 Upgrade to Mongo Driver Reactive Streams 1.9.0-beta1
Closes gh-13180
2018-05-15 16:57:50 +01:00
Andy Wilkinson
3dfacaa1e3 Upgrade to MongoDB 3.8.0-beta2
Closes gh-13179
2018-05-15 16:57:50 +01:00
Stephane Nicoll
e5ac3bc391 Merge branch '2.0.x' 2018-05-15 15:10:04 +02:00
Johnny Lim
b9aa934d78 Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
ed02d02d19 Polish "Allow repackage maven goal to take a source classifier"
Closes gh-11061
2018-05-15 15:02:22 +02:00
Björn
3c8e012411 Allow repackage maven goal to take a source classifier
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.

This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.

If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.

See gh-11061
2018-05-15 15:02:22 +02:00
Andy Wilkinson
08a12e7964 Merge branch '2.0.x' 2018-05-15 10:28:56 +01:00
Andy Wilkinson
be0b8eb871 Merge branch '1.5.x' into 2.0.x 2018-05-15 10:28:46 +01:00
Andy Wilkinson
72b45584eb Merge branch '2.0.x' 2018-05-15 09:18:06 +01:00
Andy Wilkinson
8b028e30d3 Merge branch '1.5.x' into 2.0.x 2018-05-15 09:18:01 +01:00
Andy Wilkinson
46855ab8eb Merge branch '2.0.x' 2018-05-14 20:07:57 +01:00
Andy Wilkinson
73e525a280 Merge branch '1.5.x' into 2.0.x 2018-05-14 20:07:46 +01:00
Andy Wilkinson
16457ad988 Merge branch '2.0.x' 2018-05-14 17:54:50 +01:00
Andy Wilkinson
cddc2b4483 Merge branch '1.5.x' into 2.0.x 2018-05-14 17:54:31 +01:00
Stephane Nicoll
497aebe010 Merge branch '2.0.x' 2018-05-14 18:21:33 +02:00
Stephane Nicoll
a3a6a2b291 Polish "Add CLI manifest for Scoop"
Closes gh-12541
2018-05-14 18:20:57 +02:00
Andrey Saksonov
daccdbb18d Add CLI manifest for Scoop
See gh-12541
2018-05-14 18:00:32 +02:00
Stephane Nicoll
24024b00da Merge branch '2.0.x' 2018-05-14 17:42:15 +02:00
Stephane Nicoll
2be1c8f527 Polish "Set classloader for JMX endpoints to application classloader"
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth
e44c81672f Set classloader for JMX endpoints to application classloader
See gh-12209
2018-05-14 17:41:31 +02:00
Frank Pavageau
ab7f6654d8 Manage the Mockito/JUnit 5 dependency
This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.

Closes gh-12890
2018-05-14 16:21:23 +02:00
Stephane Nicoll
c7eec5c45e Polish "Add liquibase test rollback on update property"
Closes gh-13159
2018-05-14 16:14:11 +02:00
Vladyslav Kiriushkin
08279c889c Add liquibase test rollback on update property
See gh-13159
2018-05-14 16:06:08 +02:00
Stephane Nicoll
b839c98de9 Merge branch '2.0.x' 2018-05-14 16:04:30 +02:00
Sebastien Deleuze
d747d43b23 Update Kotlin refdoc with the new tutorial
Closes gh-13161
2018-05-14 16:03:46 +02:00
Stephane Nicoll
c8dc885cc5 Add missing note
See gh-12933
2018-05-14 13:30:40 +02:00
Stephane Nicoll
602f52fffc Add support for configuring common tags declaratively
Closes gh-12933
2018-05-14 13:26:01 +02:00
Andy Wilkinson
8e4f4317f6 Merge branch '2.0.x' 2018-05-14 11:49:08 +01:00
Andy Wilkinson
285203d272 Provide dependency management for Hibernate's JPA API module
Closes gh-13154
2018-05-14 11:43:31 +01:00
Stephane Nicoll
93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path
Closes gh-12971
2018-05-14 12:24:38 +02:00
Stephane Nicoll
406192741e Upgrade to Maven Exec Plugin 1.6.0
Closes gh-13101
2018-05-14 11:19:46 +02:00
Stephane Nicoll
37324785fc Merge branch '2.0.x' 2018-05-14 11:09:15 +02:00
Stephane Nicoll
caa271dcc1 Merge branch '1.5.x' into 2.0.x 2018-05-14 11:08:59 +02:00
Stephane Nicoll
9b379b43ae Merge branch '2.0.x' 2018-05-14 09:33:16 +02:00
Stephane Nicoll
8f53c2e2bb Support for custom comment prefix
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim
fb2ab67f4f Polish
Closes gh-13148
2018-05-14 08:24:01 +02:00
Stephane Nicoll
b17c58b114 Merge branch '2.0.x' 2018-05-14 08:23:36 +02:00
Johnny Lim
3dd2f5bb05 Polish
See gh-13148
2018-05-14 08:19:10 +02:00
Stephane Nicoll
15edd02e1d Merge branch '2.0.x' 2018-05-14 08:13:40 +02:00
Johnny Lim
aa60d60b8a Polish JpaProperties.determineDdlAuto()
Closes gh-13036
2018-05-14 08:13:06 +02:00
Stephane Nicoll
8e9a873787 Polish "Improve LDAP auto-configuration conditions"
Closes gh-13143
2018-05-11 17:59:21 +02:00
Vedran Pavic
dfceede0bc Improve LDAP auto-configuration conditions
At present, auto-configuration of `LdapContextSource` is conditional on
presence of a `ContextSource` bean. However, there are valid use cases
which require multiple `ContextSource` bean, for instance
`PooledContextSource`. With the current arrangement, the
auto-configuration of `LdapContextSource` will back off if user provides
a `PooledContextSource` bean, while it would still be reasonable to
reuse the auto-configured `LdapContextSource`.

This commit improves `LdapContextSource` factory method return value and
condition to back off only if users actually provide a
`LdapContextSource` bean themselves.

See gh-13143
2018-05-11 17:59:21 +02:00
Andy Wilkinson
efda5ef3ac Merge branch '2.0.x' 2018-05-11 16:52:29 +01:00