Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,597 Commits 23 Branches 0 Tags
faeda6f9174754642bb1735165412918db65e648
Commit Graph

32597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
faeda6f917 Polish 2021-06-08 10:32:50 +02:00
Stephane Nicoll
4c71e8124d Upgrade to Undertow 2.2.8.Final 
Closes gh-26809
 2021-06-08 08:24:55 +02:00
Stephane Nicoll
11d31edf0a Upgrade to Neo4j Java Driver 4.2.6 
Closes gh-26808
 2021-06-08 08:24:54 +02:00
Stephane Nicoll
88b9b88cd9 Upgrade to jOOQ 3.14.11 
Closes gh-26807
 2021-06-08 08:24:53 +02:00
Stephane Nicoll
b755eacd86 Upgrade to Johnzon 1.2.13 
Closes gh-26806
 2021-06-08 08:24:51 +02:00
Stephane Nicoll
3d5caf0863 Upgrade to JBoss Logging 3.4.2.Final 
Closes gh-26805
 2021-06-08 08:24:50 +02:00
Stephane Nicoll
a74fb0c2f0 Upgrade to Infinispan 12.1.4.Final 
Closes gh-26804
 2021-06-08 08:24:50 +02:00
Stephane Nicoll
b4d0c3df6d Upgrade to Hibernate 5.4.32.Final 
Closes gh-26803
 2021-06-08 08:24:49 +02:00
Stephane Nicoll
7ea263548c Upgrade to Gson 2.8.7 
Closes gh-26802
 2021-06-08 08:24:48 +02:00
Stephane Nicoll
e2a877ca07 Upgrade to Ehcache3 3.9.4 
Closes gh-26801
 2021-06-08 08:24:47 +02:00
Stephane Nicoll
5a18553b50 Upgrade to Dropwizard Metrics 4.1.22 
Closes gh-26800
 2021-06-08 08:24:45 +02:00
Stephane Nicoll
b9d29130fb Upgrade to Couchbase Client 3.1.6 
Closes gh-26799
 2021-06-08 08:24:44 +02:00
Stephane Nicoll
cd8a9d3705 Upgrade to AppEngine SDK 1.9.89 
Closes gh-26798
 2021-06-08 08:24:43 +02:00
Phillip Webb
f5b93da90f Fix conversion failures when using DefaultResolver 
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.

Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.

Fixes gh-26732
 2021-06-07 22:07:22 -07:00
Phillip Webb
be23a29651 Polish 2021-06-07 20:44:23 -07:00
Andy Wilkinson
87d35250a5 Test our Gradle plugin against 7.1-rc-1 
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
 2021-06-07 13:35:52 +01:00
Stephane Nicoll
15721595fe Merge branch '2.4.x' 2021-06-07 08:24:25 +02:00
Stephane Nicoll
bac89a3919 Upgrade to Undertow 2.2.8.Final 
Closes gh-26791
 2021-06-07 07:57:54 +02:00
Stephane Nicoll
d6f22f0802 Upgrade to jOOQ 3.14.11 
Closes gh-26790
 2021-06-07 07:57:53 +02:00
Stephane Nicoll
99169af57c Upgrade to Johnzon 1.2.13 
Closes gh-26789
 2021-06-07 07:57:52 +02:00
Stephane Nicoll
fe249dd772 Upgrade to JBoss Logging 3.4.2.Final 
Closes gh-26788
 2021-06-07 07:57:51 +02:00
Stephane Nicoll
5be4a9ab50 Upgrade to Hibernate 5.4.32.Final 
Closes gh-26787
 2021-06-07 07:57:50 +02:00
Stephane Nicoll
e496d2e321 Upgrade to Gson 2.8.7 
Closes gh-26786
 2021-06-07 07:57:49 +02:00
Stephane Nicoll
16ff9318b5 Upgrade to Ehcache3 3.9.4 
Closes gh-26785
 2021-06-07 07:57:48 +02:00
Stephane Nicoll
90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22 
Closes gh-26784
 2021-06-07 07:57:47 +02:00
Stephane Nicoll
cfaab0904b Upgrade to AppEngine SDK 1.9.89 
Closes gh-26783
 2021-06-07 07:57:46 +02:00
Phillip Webb
abd926788f Merge branch '2.4.x' 
Closes gh-26782
 2021-06-06 21:53:10 -07:00
Phillip Webb
7396e1e743 Fix property ordering within '.' and '/config' 
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
 2021-06-06 21:05:54 -07:00
Stephane Nicoll
e45b1b6550 Merge branch '2.4.x' 2021-06-06 20:44:51 +02:00
Stephane Nicoll
c0cbef9aaa Merge branch '2.3.x' into 2.4.x 2021-06-06 20:44:41 +02:00
Stephane Nicoll
1e680241ed Upgrade to Johnzon 1.2.13 
Closes gh-26781
 2021-06-06 20:25:54 +02:00
Stephane Nicoll
3a0794da4b Upgrade to JBoss Logging 3.4.2.Final 
Closes gh-26780
 2021-06-06 20:25:52 +02:00
Stephane Nicoll
84a4693dcf Upgrade to Hibernate 5.4.32.Final 
Closes gh-26779
 2021-06-06 20:25:51 +02:00
Stephane Nicoll
790a8c1f47 Upgrade to Gson 2.8.7 
Closes gh-26778
 2021-06-06 20:25:50 +02:00
Stephane Nicoll
7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22 
Closes gh-26777
 2021-06-06 20:25:48 +02:00
Stephane Nicoll
f3049e8e94 Upgrade to AppEngine SDK 1.9.89 
Closes gh-26776
 2021-06-06 20:25:47 +02:00
Stephane Nicoll
5391f028a7 Start building against Spring Kafka 2.7.2 snapshots 
See gh-26765
 2021-06-06 20:23:37 +02:00
Stephane Nicoll
caacee5f1c Start building against Spring AMQP 2.3.8 
See gh-26764
 2021-06-06 20:23:11 +02:00
Stephane Nicoll
c435f6337c Start building against Spring Framework 5.3.8 snapshots 
See gh-26761
 2021-06-06 20:22:45 +02:00
Stephane Nicoll
47b36ddb26 Merge branch '2.4.x' 2021-06-05 18:38:16 +02:00
Stephane Nicoll
d1652c2749 Merge branch '2.3.x' into 2.4.x 2021-06-05 18:38:05 +02:00
Stephane Nicoll
39f259554b Start building against Spring Integration 5.3.8 snapshots 
See gh-26772
 2021-06-05 18:24:22 +02:00
Stephane Nicoll
37625854b6 Start building against Spring Kafka 2.5.14 snapshots 
See gh-26771
 2021-06-05 18:23:57 +02:00
Stephane Nicoll
323d1e224d Start building against Spring AMQP 2.2.18 snapshots 
See gh-26770
 2021-06-05 18:23:27 +02:00
Stephane Nicoll
ed00db0765 Merge branch '2.4.x' 2021-06-04 18:01:08 +02:00
Stephane Nicoll
de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots 
See gh-26763
 2021-06-04 17:50:30 +02:00
Stephane Nicoll
4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots 
See gh-26762
 2021-06-04 17:50:30 +02:00
Stephane Nicoll
d2fe417bbb Start building against Spring Framework 5.3.8 snapshots 
See gh-26760
 2021-06-04 17:50:30 +02:00
Stephane Nicoll
5ac5038176 Merge branch '2.4.x' 2021-06-04 17:49:52 +02:00
Stephane Nicoll
aea8597114 Merge branch '2.3.x' into 2.4.x 2021-06-04 17:49:40 +02:00