Brian Clozel
fe82098d7d
Merge branch '2.7.x'
2022-01-14 21:07:45 +01:00
Brian Clozel
cdee953252
Polish
2022-01-14 21:07:29 +01:00
Brian Clozel
8cc4dffde9
Merge branch '2.7.x'
2022-01-14 21:07:14 +01:00
Brian Clozel
68806bfef8
Fix build after Spring for GraphQL changes
...
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson
d60da1cc59
Merge branch '2.7.x'
2022-01-14 15:56:03 +00:00
Andy Wilkinson
b67cc62c37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29402
2022-01-14 15:55:54 +00:00
Andy Wilkinson
d29a5a2f43
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29401
2022-01-14 15:55:41 +00:00
Andy Wilkinson
e8cbec0836
Clarify documentation of RestTemplate customization
...
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson
16447e1bce
Merge branch '2.7.x'
2022-01-14 15:50:12 +00:00
Andy Wilkinson
ece4c8ad93
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson
d051146eb4
Use Testcontainers instead on Embedded Mongo
...
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.
Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll
61d67a3a3d
Merge branch '2.7.x'
2022-01-14 16:22:51 +01:00
Stephane Nicoll
399c5785c4
Merge branch '2.6.x' into 2.7.x
2022-01-14 16:22:21 +01:00
Stephane Nicoll
1b2fa3cec1
Merge branch '2.5.x' into 2.6.x
2022-01-14 16:22:10 +01:00
Stephane Nicoll
1666b1c284
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29398
2022-01-14 15:54:48 +01:00
Stephane Nicoll
c2fa4ffd7e
Upgrade to SLF4J 1.7.33
...
Closes gh-29397
2022-01-14 15:49:56 +01:00
Stephane Nicoll
afcba76c3c
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29396
2022-01-14 15:49:55 +01:00
Stephane Nicoll
dac4888137
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29395
2022-01-14 15:49:54 +01:00
Stephane Nicoll
af79829cab
Upgrade to Spring Data 2021.1.1
...
Closes gh-29317
2022-01-14 15:44:45 +01:00
Stephane Nicoll
1e44e4e52e
Upgrade to Spring HATEOAS 1.4.1
...
Closes gh-29283
2022-01-14 15:44:16 +01:00
Andy Wilkinson
1ffdfa6c63
Merge pull request #29389 from dsyer
...
* gh-29389:
Polish "Avoid split java.xml packages that cause JDT compile errors"
Avoid split java.xml packages that cause JDT compile errors
Closes gh-29389
2022-01-14 13:13:50 +00:00
Andy Wilkinson
15dafebe0d
Polish "Avoid split java.xml packages that cause JDT compile errors"
...
See gh-29389
2022-01-14 12:43:16 +00:00
Dave Syer
32a6c7df49
Avoid split java.xml packages that cause JDT compile errors
...
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.
See gh-29389
2022-01-14 12:42:02 +00:00
Stephane Nicoll
5883b22e01
Upgrade to SLF4J 1.7.33
...
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll
1e22504d21
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll
251f4e8a3f
Upgrade to Spring AMQP 2.3.14
...
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll
777361421c
Upgrade to Spring Data 2021.0.8
...
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll
37a44f45a0
Upgrade to Spring HATEOAS 1.3.7
...
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll
abb88b9aeb
Upgrade to Micrometer 2.0.0-M1
...
Closes gh-29279
2022-01-14 09:09:17 +01:00
Andy Wilkinson
a79cba129f
Remove faulty javadoc styling
...
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.
See gh-28101
2022-01-13 15:39:34 +00:00
Stephane Nicoll
9a9cfa78c8
Merge branch '2.7.x'
2022-01-13 15:31:38 +01:00
Stephane Nicoll
77a9d0b6f1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29381
2022-01-13 15:31:31 +01:00
Stephane Nicoll
535254b4ad
Merge pull request #29380 from Omkar-Shetkar
...
* pr/29380:
Fix duplicate "Logging" link
Closes gh-29380
2022-01-13 15:31:22 +01:00
Omkar Shetkar
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll
2a0b753732
Merge branch '2.7.x'
2022-01-13 14:43:21 +01:00
Stephane Nicoll
b3b72f0869
Merge branch '2.6.x' into 2.7.x
2022-01-13 14:43:09 +01:00
Stephane Nicoll
83c02e4cfa
Merge branch '2.5.x' into 2.6.x
2022-01-13 14:42:59 +01:00
Stephane Nicoll
5161e5a5f2
Upgrade to Spring Framework 6.0.0-M2
...
Closes gh-28642
2022-01-13 14:41:50 +01:00
Stephane Nicoll
d82fbcb43b
Upgrade to Micrometer 1.9.0-M2
...
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll
7a0f7c498f
Upgrade to Spring Framework 5.3.15
...
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll
832d8845df
Upgrade to Micrometer 1.8.2
...
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll
f65d766fbe
Upgrade to Spring Framework 5.3.15
...
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll
aa0a788800
Upgrade to Micrometer 1.7.8
...
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll
5428106925
Upgrade to Spring Framework 5.3.15
...
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll
f97d5af467
Upgrade CI to Docker 20.10.12
...
Closes gh-29365
2022-01-13 10:13:15 +01:00
Stephane Nicoll
f8f0c7cc60
Upgrade Ubuntu version in CI images
...
Closes gh-29364
2022-01-13 10:12:47 +01:00
Stephane Nicoll
62cf901cfa
Merge branch '2.7.x'
2022-01-13 10:12:00 +01:00
Stephane Nicoll
40fa349f3c
Merge branch '2.6.x' into 2.7.x
2022-01-13 10:11:52 +01:00
Stephane Nicoll
4a87980180
Merge branch '2.5.x' into 2.6.x
2022-01-13 10:11:43 +01:00