Commit Graph

33172 Commits

Author SHA1 Message Date
Stephane Nicoll
9fd6ff7e88 Start building against Spring Framework 5.2.7 snapshots
See gh-21739
2020-06-07 11:14:02 +02:00
Stephane Nicoll
83acb39a1e Merge branch '2.2.x' into 2.3.x 2020-06-07 11:13:25 +02:00
Stephane Nicoll
4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
2020-06-07 10:54:38 +02:00
Stephane Nicoll
b997154caa Merge branch '2.1.x' into 2.2.x 2020-06-07 10:53:47 +02:00
Stephane Nicoll
d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
2020-06-07 10:37:47 +02:00
Phillip Webb
621d120ba3 Merge branch '2.3.x'
Closes gh-21735
2020-06-06 12:07:00 -07:00
Phillip Webb
6e02049dd9 Merge pull request #20929 from encircled
* pr/20929:
  Polish 'Allow beans without public constructors to load'
  Allow beans without public constructors to load

Closes gh-20929
2020-06-06 12:06:47 -07:00
Phillip Webb
c11abf48d9 Polish 'Allow beans without public constructors to load'
See gh-20929
2020-06-06 12:05:50 -07:00
Vlad Kisel
d8d8f9cf0b Allow beans without public constructors to load
Allow `BeanDefinitionLoader` to load classes that don't have public
constructors. The constraint was first introduced in d82c50804f to
solve an issue with anonymous Groovy classes but causes particular
problems with `@SpringBootTest`.

See gh-20929
2020-06-06 11:59:47 -07:00
Phillip Webb
5f79bd2a09 Merge branch '2.3.x'
Closes gh-21734
2020-06-06 11:08:30 -07:00
Phillip Webb
a0518d3cb8 Merge pull request #21732 from dreis2211
* pr/21732:
  Polish

Closes gh-21732
2020-06-06 11:07:59 -07:00
dreis2211
2b5569f054 Polish
See gh-21732
2020-06-06 11:07:21 -07:00
Stephane Nicoll
ec2ce10d65 Merge branch '2.3.x' 2020-06-06 09:59:33 +02:00
Stephane Nicoll
44f375c508 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21731
2020-06-06 09:57:21 +02:00
Stephane Nicoll
cc981b1aa9 Merge branch '2.2.x' into 2.3.x 2020-06-06 09:54:18 +02:00
Stephane Nicoll
f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
2020-06-06 09:26:15 +02:00
Stephane Nicoll
9141e9b9e0 Merge branch '2.1.x' into 2.2.x 2020-06-06 09:24:54 +02:00
Stephane Nicoll
0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
2020-06-06 08:48:15 +02:00
Phillip Webb
d791d18231 Merge branch '2.3.x'
Closes gh-21727
2020-06-05 19:34:16 -07:00
Phillip Webb
2f973ebc33 Fix default Launcher.isExploded() result
Fix the default implementation of `Launcher.isExploded` which should
have returned `true`.

Fixes gh-21575
2020-06-05 19:32:06 -07:00
Phillip Webb
0cb473d9c9 Merge branch '2.3.x' 2020-06-05 16:22:25 -07:00
Phillip Webb
9b95ab26f7 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:22:06 -07:00
Phillip Webb
97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb
d356a24a07 Merge branch '2.3.x'
Closes gh-21726
2020-06-05 16:20:39 -07:00
Phillip Webb
bbb57428cb Merge pull request #21523 from dreis2211
* pr/21523:
  Polish 'Optimize SystemEnvironmentPropertyMapper'
  Optimize SystemEnvironmentPropertyMapper
  Call append only when necessary
  Use chars rather than strings

Closes gh-21523
2020-06-05 16:17:21 -07:00
Phillip Webb
47c1928189 Polish 'Optimize SystemEnvironmentPropertyMapper'
Introduce a new `ConfigurationPropertyName.ofIfValid` method to
save us needing to throw and catch an exception unnecessarily.

See gh-21523
2020-06-05 16:11:52 -07:00
dreis2211
0378de7b30 Optimize SystemEnvironmentPropertyMapper
See gh-21523
2020-06-05 16:11:28 -07:00
dreis2211
f8d6d9a4b0 Call append only when necessary
See gh-21523
2020-06-05 16:11:11 -07:00
dreis2211
33deba4948 Use chars rather than strings
Update `SystemEnvironmentPropertyMapper` to use single chars
rather than strings whenever possible.

See gh-21523
2020-06-05 15:52:18 -07:00
Phillip Webb
b1044ca883 Update copyright year of changed files 2020-06-05 15:37:47 -07:00
Phillip Webb
8a7a5929ae Merge branch '2.3.x' 2020-06-05 15:37:33 -07:00
Phillip Webb
de8970ec8e Update copyright year of changed files 2020-06-05 15:37:24 -07:00
Phillip Webb
cc50605687 Merge branch '2.2.x' into 2.3.x 2020-06-05 15:36:44 -07:00
Phillip Webb
0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb
c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
2020-06-05 15:36:09 -07:00
Phillip Webb
3107d2de51 Merge branch '2.3.x'
Fixes gh-21705 in master
2020-06-05 15:33:46 -07:00
Phillip Webb
9a235197dc Propagate manifest to exploded jars
Update `LaunchedURLClassLoader` so that packages defined from exploded
archive folders have manifest attributes applied to them. Prior to this
calling `package.getImplementationTitle()` would only return the a
manifiest attribute when running non-exploded.

The root cause of this issue is the way that `URLClassLoader` handles
the different URL types. For URLs that reference a jar the manifest is
available. For URLs that reference a folder it isn't. When running
exploded we use a URL that references to the `BOOT-INF/classes` folder
directly. To fix the issue we now attempt to detect when `definePackage`
is being called directly, and replace `null` entries with actual
manifest values.

Fixes gh-21705
2020-06-05 15:28:16 -07:00
Stephane Nicoll
0bc6159e44 Merge branch '2.3.x'
Closes gh-21721
2020-06-05 16:42:12 +02:00
Stephane Nicoll
400a168ce9 Merge branch '2.2.x' into 2.3.x
Closes gh-21720
2020-06-05 16:41:24 +02:00
Stephane Nicoll
221e248b66 Merge pull request #21671 from dreis2211
* pr/21671:
  Remove usages of deprecated Connector.setAttribute()

Closes gh-21671
2020-06-05 16:41:07 +02:00
dreis2211
9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
2020-06-05 16:32:42 +02:00
Stephane Nicoll
bb86d2b3d4 Merge branch '2.3.x' 2020-06-05 16:25:38 +02:00
Stephane Nicoll
79a5ca2941 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:25:24 +02:00
Stephane Nicoll
eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson
2f06cbc9c9 Merge pull request #21559 from dreis2211
* gh-21559:
  Polish "Print the java version being used on startup"
  Print the java version being used on startup

Closes gh-21559
2020-06-05 14:19:46 +01:00
Andy Wilkinson
82cc7e972d Polish "Print the java version being used on startup"
See gh-21559
2020-06-05 14:19:15 +01:00
dreis2211
731c192817 Print the java version being used on startup
See gh-21559
2020-06-05 14:12:08 +01:00
Andy Wilkinson
7b7e68a9aa Merge pull request #21691 from dreis2211
* gh-21691:
  Add Java 15 to JavaVersion enum

Closes gh-21691
2020-06-05 14:09:08 +01:00
dreis2211
85a6686cae Add Java 15 to JavaVersion enum
See gh-21691
2020-06-05 14:08:09 +01:00
Andy Wilkinson
8fb7a6cace Remove JUnit 5's vintage engine from spring-boot-starter-test
Closes gh-21625
2020-06-05 14:02:26 +01:00