Commit Graph

33172 Commits

Author SHA1 Message Date
Stephane Nicoll
100fc8cf2c Merge branch '2.1.x' 2019-10-02 17:57:03 +02:00
Spring Buildmaster
2423275128 Next development version (v2.1.10.BUILD-SNAPSHOT) 2019-10-02 15:31:12 +00:00
Andy Wilkinson
5b394c601b Polish repository id 2019-10-02 13:44:52 +01:00
Andy Wilkinson
9e514ab7f9 Provide plugin release repository for Asciidoctor Extensions
See b5069a4f8a
2019-10-02 13:43:34 +01:00
Andy Wilkinson
dab69cfbd2 Upgrade to Promethus Pushgateway 0.7.0
Closes gh-18418
2019-10-02 11:26:47 +01:00
Andy Wilkinson
b5069a4f8a Upgrade to Spring Asciidoctor Extensions 0.3.0.RELEASE
Closes gh-18474
2019-10-02 11:07:28 +01:00
Andy Wilkinson
46c30d6bb0 Merge branch '2.1.x'
Closes gh-18476
2019-10-02 10:48:57 +01:00
Andy Wilkinson
3d4157ad6d Correct SCM URLs in published poms
Previously, Maven's default behaviour was relied up which resulted
in the artifact ID being appended to each URL as it was inherited.
This behaviour can only be disabled in Maven 3.6 and later, a version
that we cannot use due to an incompatibility with the Flatten Plugin.

This commit works around Maven's default behaviour by defining
properties for the SCM URL, connection, and developer connection and
then explicitly defining the settings in each pom using these
properties. The explicit definition of the properties in each pom
prevents them being inherited from the parent, thereby disabling the
unwanted appending of the artifact ID to the URL.

Fixes gh-18328
2019-10-02 10:48:30 +01:00
Andy Wilkinson
f029fa55da Upgrade to Spring Batch 4.2.0.RELEASE
Closes gh-18252
2019-10-02 07:37:19 +01:00
Andy Wilkinson
e507d47571 Upgrade to Spring Session Corn-RC1
Closes gh-18257
2019-10-02 07:36:22 +01:00
Phillip Webb
e2ae403ed8 Merge pull request #18438 from 785172550
* pr/18438:
  Polish 'Simplify some code'
  Simplify some code

Closes gh-18438
2019-10-01 22:10:47 -07:00
Phillip Webb
b65ba60980 Polish 'Simplify some code'
See gh-18438
2019-10-01 22:08:20 -07:00
kenneth
e6b45de41e Simplify some code
See gh-18438
2019-10-01 22:08:02 -07:00
Phillip Webb
e41c5a4327 Require annotation signal for constructor binding
Update `@ConfigurationProperties` constructor binding support to only
apply when a `@ConstructorBinding` annotation is present on either the
type or the specific constructor to use.

Prior to this commit we didn't have a good way to tell when constructor
binding should be used vs regular autowiring.

For convenience, an `@ImmutableConfigurationProperties` meta-annotation
has also been added which is composed of `@ConfigurationProperties` and
`@ConstructorBinding`.

Closes gh-18469
2019-10-01 21:56:09 -07:00
Phillip Webb
ecf751e7eb Polish 2019-10-01 20:51:54 -07:00
Andy Wilkinson
1222a73dcc Polish 2019-10-01 21:58:53 +01:00
Andy Wilkinson
557d187607 Revert "Upgrade to Spring Session Corn-RC1"
This reverts commit e7e69e2e16.

See gh-18257
2019-10-01 21:53:05 +01:00
Andy Wilkinson
e7e69e2e16 Upgrade to Spring Session Corn-RC1
Closes gh-18257
2019-10-01 21:33:27 +01:00
Andy Wilkinson
5a6e6cc53d Merge pull request #18470 from vpavic
* gh-18470:
  Align with Spring Session MongoDB deprecations

Closes gh-18470
2019-10-01 21:32:59 +01:00
Vedran Pavic
4808016560 Align with Spring Session MongoDB deprecations
See gh-18470
2019-10-01 21:32:45 +01:00
Andy Wilkinson
6a5f608f30 Upgrade to Spring Kafka 2.3.0.RELEASE
Closes gh-18255
2019-10-01 21:26:14 +01:00
Andy Wilkinson
9e1825ed42 Upgrade to Spring Integration 5.2.0.RELEASE
Closes gh-18254
2019-10-01 21:25:35 +01:00
Andy Wilkinson
ead1304bb5 Upgrade to Spring AMQP 2.2.0.RELEASE
Closes gh-18251
2019-10-01 21:24:58 +01:00
Phillip Webb
b262ebf5b4 Update copyright header of changed files 2019-10-01 11:40:07 -07:00
Phillip Webb
a8139ba819 Merge branch '2.1.x' 2019-10-01 11:39:46 -07:00
Phillip Webb
40acbfc733 Update copyright header of changed files 2019-10-01 11:39:38 -07:00
Phillip Webb
262eb686d0 Merge branch '2.1.x'
Closes gh-18468
2019-10-01 11:34:56 -07:00
Madhura Bhave
ecf393461e Skip management context ResourceConfigCustomizers
Update `JerseyManagementContextConfiguration` so that customizer beans
are not longer applied. The endpoint resource endpoints are now added
with a registrar bean `@PostConstruct` method.

Prior to this commit, when running the management server on a different
port a `Resource` added by a customizer could be added two different
`ResourceConfig` instance. This breaks the singleton contract expected
by Jersey.

Fixes gh-17801

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-10-01 11:16:23 -07:00
Stephane Nicoll
5f4ddd98d8 Upgrade to Spring Security 5.2.0.RELEASE
Closes gh-18256
2019-10-01 18:33:11 +02:00
Stephane Nicoll
1dd0aff467 Merge branch '2.1.x' 2019-10-01 18:32:41 +02:00
Johnny Lim
3a63179d81 Fix a broken Asciidoctor syntax
Along the way, this commit also fixes a typo.

Closes gh-18325
2019-10-01 18:32:01 +02:00
Andy Wilkinson
ed29eea365 Align Spring Asciidoctor Extension dependency with new module names 2019-10-01 14:54:03 +01:00
Stephane Nicoll
93f317ca41 Merge branch '2.1.x' 2019-10-01 15:30:33 +02:00
Stephane Nicoll
b0d6169285 Upgrade to Spring Session Bom Bean-SR8
Closes gh-18466
2019-10-01 15:29:45 +02:00
Stephane Nicoll
9d40d192a0 Upgrade to Micrometer 1.1.7
Closes gh-18465
2019-10-01 15:29:44 +02:00
Stephane Nicoll
852b369ce1 Revert to fixed version 2019-10-01 15:20:23 +02:00
Stephane Nicoll
4237d9fc1a Merge branch '2.1.x'
See gh-18316
2019-10-01 15:04:50 +02:00
Stephane Nicoll
47365dc260 Revert to Spring Web Services 3.0.7.RELEASE
See gh-18315
2019-10-01 15:03:11 +02:00
Stephane Nicoll
91afd289bf Upgrade to Download Maven Plugin 1.4.2
Closes gh-18459
2019-10-01 15:00:11 +02:00
Stephane Nicoll
fc7c0ba32e Upgrade to Commons FileUpload 1.4
Closes gh-18450
2019-10-01 14:27:43 +02:00
Stephane Nicoll
b2334dd871 Upgrade to gmavenplus-plugin 1.8.0
Closes gh-18462
2019-10-01 14:24:16 +02:00
Stephane Nicoll
94de7ee97e Upgrade to Cargo Maven Plugin 1.7.7
Closes gh-18461
2019-10-01 14:18:33 +02:00
Stephane Nicoll
9f2201c5e5 Upgrade to Maven Maven Plugin 3.6.0
Closes gh-18460
2019-10-01 14:09:58 +02:00
Stephane Nicoll
9133d52416 Upgrade to plexus-archiver to 3.7.0
Closes gh-18457
2019-10-01 14:02:51 +02:00
Stephane Nicoll
67bb90ee5a Upgrade to maven-plugin-annotations 3.6.0
Closes gh-18456
2019-10-01 14:02:51 +02:00
Stephane Nicoll
4008d70248 Upgrade to maven-common-artifact-filters 3.1.0
Closes gh-18455
2019-10-01 14:02:51 +02:00
Stephane Nicoll
a1e83558c2 Upgrade to maven-archiver 3.4.0
Closes gh-18453
2019-10-01 14:02:51 +02:00
Stephane Nicoll
b66288219a Upgrade to Spock 1.3-groovy-2.5
Closes gh-18458
2019-10-01 14:02:43 +02:00
Stephane Nicoll
9330760e22 Upgrade to MockK 1.9.3
Closes gh-18452
2019-10-01 13:58:49 +02:00
Stephane Nicoll
112cbd216b Remove plugin dependency management for the Sonar plugin 2019-10-01 13:58:49 +02:00