Commit Graph

33172 Commits

Author SHA1 Message Date
Stephane Nicoll
ee4820dc8c Merge branch '2.3.x' 2020-11-10 11:22:55 +01:00
Stephane Nicoll
0c43d13789 Upgrade to Spring Framework 5.2.11
Closes gh-24034
2020-11-10 11:21:24 +01:00
Stephane Nicoll
45f1133e1e Merge branch '2.3.x' 2020-11-10 09:49:49 +01:00
Stephane Nicoll
339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 2020-11-10 09:47:46 +01:00
Stephane Nicoll
5123eb0c74 Fix deprecation in Testcontainers 1.15.0
See gh-24103
2020-11-10 09:39:18 +01:00
Stephane Nicoll
7fb21fbff3 Merge branch '2.3.x'
Closes gh-24104
2020-11-10 08:47:51 +01:00
Stephane Nicoll
c1a1b5fe71 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 08:46:15 +01:00
Stephane Nicoll
da68d835c7 Merge branch '2.2.x' into 2.3.x 2020-11-10 08:06:13 +01:00
Stephane Nicoll
48bfdc1314 Revert "Upgrade to testcontainers 1.15.0"
This reverts commit b1c446d1b2.
2020-11-10 07:49:23 +01:00
Stephane Nicoll
b1c446d1b2 Upgrade to testcontainers 1.15.0
Closes gh-24103
2020-11-10 07:20:26 +01:00
Stephane Nicoll
33d83ebc94 Merge branch '2.3.x' 2020-11-09 14:41:03 +01:00
Stephane Nicoll
6aca0275ad Polish 2020-11-09 14:40:44 +01:00
Andy Wilkinson
409e3ccecf Ignore resolution of copied configuration
When a Configuration is copied, any before and after resolve actions
that are registered with its ResolvableDependencies are also copied
over. This means that, when a copied configuration is resolved the
resolution actions may be called on a ResolvableDependencies instances
that isn't the one to which they were added.

Previously, the above-described Gradle behaviour would result in
BootJar accessed the ResolvedConfiguration of a Configuration that may
not have yet been resolved. At best this would trigger Configuration
resolution and at worst it would fail. A failure could occur if the
configuration had been copied so that it could be made resolvable.
The afterResolve action would then try to access the
ResolvedConfiguration of the original Configuration. This would trigger
a resolution attempt that fails due to the original configuration being
marked as unresolvable.

This commit updates the afterResolve action in BootJar to check that
the ResolvableDependencies with which it is called matches the
ResolvableDependencies with which it was original registered. Only
when the two match, and therefore the configuration has actually been
resolved, does processing proceed.

Fixes gh-24072
2020-11-09 10:21:41 +00:00
Stephane Nicoll
e2af680f02 Upgrade to SendGrid 4.6.8
Closes gh-24090
2020-11-09 08:45:35 +01:00
Stephane Nicoll
05a226aa11 Upgrade to Pooled JMS 1.2.1
Closes gh-24089
2020-11-09 08:45:34 +01:00
Stephane Nicoll
2e119e7f30 Upgrade to Nimbus JOSE JWT 9.1.2
Closes gh-24088
2020-11-09 08:45:33 +01:00
Stephane Nicoll
2a98e2eb98 Upgrade to Kotlin Coroutines 1.4.1
Closes gh-24087
2020-11-09 08:45:31 +01:00
Stephane Nicoll
d2d968ba16 Upgrade to jOOQ 3.14.1
Closes gh-24086
2020-11-09 08:45:30 +01:00
Stephane Nicoll
706de82d39 Upgrade to Hibernate 5.4.23.Final
Closes gh-24085
2020-11-09 08:45:29 +01:00
Stephane Nicoll
a0d6504669 Upgrade to Couchbase Client 3.0.10
Closes gh-24084
2020-11-09 08:45:28 +01:00
Stephane Nicoll
599a7737db Upgrade to Byte Buddy 1.10.18
Closes gh-24083
2020-11-09 08:45:26 +01:00
Stephane Nicoll
319aa0d478 Upgrade to AppEngine SDK 1.9.83
Closes gh-24082
2020-11-09 08:45:25 +01:00
Stephane Nicoll
7b1c95edec Merge branch '2.3.x' 2020-11-09 08:43:29 +01:00
Stephane Nicoll
d962a074c3 Upgrade to jOOQ 3.13.6
Closes gh-24081
2020-11-09 08:22:32 +01:00
Stephane Nicoll
2c67acb970 Upgrade to Hibernate 5.4.23.Final
Closes gh-24080
2020-11-09 08:22:31 +01:00
Stephane Nicoll
0142ed1e5c Upgrade to Couchbase Client 3.0.10
Closes gh-24079
2020-11-09 08:22:30 +01:00
Stephane Nicoll
ebfa494b2e Upgrade to Byte Buddy 1.10.18
Closes gh-24078
2020-11-09 08:22:28 +01:00
Stephane Nicoll
df6181f6bf Upgrade to AppEngine SDK 1.9.83
Closes gh-24077
2020-11-09 08:22:27 +01:00
Andy Wilkinson
dfe3058dff Only pick up new maintenance releases when upgrading dependencies
Closes gh-24069
2020-11-06 15:55:15 +00:00
Stephane Nicoll
4c42affcc6 Start building against Spring Framework 5.3.1 snapshots
See gh-24035
2020-11-06 16:43:42 +01:00
Stephane Nicoll
ef74f79b54 Merge branch '2.3.x' 2020-11-06 16:43:21 +01:00
Stephane Nicoll
2282c73aab Start building against Spring Framework 5.2.11 snapshots
See gh-24034
2020-11-06 16:41:47 +01:00
Brian Clozel
fe359bcbfb Merge branch '2.3.x'
Closes gh-24067
2020-11-06 14:49:42 +01:00
Brian Clozel
e98db484bc Upgrade to spring-doc-resources 0.2.4
Closes gh-24066
2020-11-06 14:48:53 +01:00
Andy Wilkinson
6a2332d477 Merge branch '2.3.x'
Closes gh-24062
2020-11-05 15:55:09 +00:00
Andy Wilkinson
44d0ce5ff1 Merge branch '2.2.x' into 2.3.x
Closes gh-24060
2020-11-05 15:53:53 +00:00
Andy Wilkinson
9c5d1646bd Show how to configure a case-sensitive physical naming strategy
Closes gh-24045
2020-11-05 15:53:32 +00:00
Stephane Nicoll
946be4eab6 Merge branch '2.3.x'
Closes gh-24059
2020-11-05 16:33:28 +01:00
Stephane Nicoll
4a8646bd09 Merge branch '2.2.x' into 2.3.x
Closes gh-24058
2020-11-05 16:32:52 +01:00
Andy Wilkinson
38821c15da Merge branch '2.3.x'
Closes gh-24057
2020-11-05 15:01:49 +00:00
Stephane Nicoll
59ea7c11f6 Use most specific getter when generating metadata
This commit makes sure to use the most specific getter if more than
one candidate exists.

Closes gh-24002
2020-11-05 16:01:28 +01:00
Andy Wilkinson
1e100677c7 Reduce scope of META-INF customizations to main, source, and javadoc jars
Closes gh-23955
2020-11-05 15:01:08 +00:00
Andy Wilkinson
d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
2020-11-05 14:37:49 +00:00
Andy Wilkinson
49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
2020-11-05 14:37:22 +00:00
Andy Wilkinson
ce8427793f Merge branch '2.3.x'
See gh-24053
2020-11-05 12:19:44 +00:00
Andy Wilkinson
91f4541a91 Merge branch '2.2.x' into 2.3.x
See gh-24052
2020-11-05 12:19:13 +00:00
Andy Wilkinson
006d4bc36d Do not set Tomcat's trust store password when null
See gh-24041
2020-11-05 12:18:32 +00:00
Andy Wilkinson
06f37f4295 Merge branch '2.3.x'
Closes gh-24053
2020-11-05 11:40:07 +00:00
Andy Wilkinson
2ffb81f0d9 Merge branch '2.2.x' into 2.3.x
Closes gh-24052
2020-11-05 11:35:37 +00:00
Andy Wilkinson
2425dcd200 Do not set Tomcat's key store and key pass when null
Fixes gh-24041
2020-11-05 11:30:04 +00:00