root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 18 Packages Projects Releases Wiki Activity
28,160 Commits 23 Branches 348 Tags 279 MiB
Commit Graph

28160 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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
Stephane Nicoll baef6c803d Merge pull request #21692 from making 
* pr/21692:
  Fix event name in documentation

Closes gh-21692
 2020-06-05 14:54:42 +02:00
Toshiaki Maki 0cd526c266 Fix event name in documentation 
See gh-21692
 2020-06-05 14:51:53 +02:00
Stephane Nicoll e936e9aa6a Merge pull request #21653 from ThierrySquirrel 
* pr/21653:
  Polish "Add reference to rocketmq-spring-boot-starter"
  Add reference to rocketmq-spring-boot-starter

Closes gh-21653
 2020-06-05 14:49:25 +02:00
Stephane Nicoll 4624bf6552 Polish "Add reference to rocketmq-spring-boot-starter" 
See gh-21653
 2020-06-05 14:49:19 +02:00
ThierrySquirrel c547567882 Add reference to rocketmq-spring-boot-starter 
See gh-21653
 2020-06-05 14:49:19 +02:00
Andy Wilkinson 4fdd1a64c9 Merge branch '2.2.x' into 2.3.x 
Closes gh-21718
 2020-06-05 13:41:21 +01:00
Andy Wilkinson 1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter 
Closes gh-21717
 2020-06-05 13:40:30 +01:00
Andy Wilkinson 0415c307c7 Merge branch '2.2.x' into 2.3.x 
Closes gh-21683
 2020-06-05 12:52:50 +01:00
Andy Wilkinson 97533a5364 Merge branch '2.1.x' into 2.2.x 
Closes gh-21682
 2020-06-05 12:52:24 +01:00
Andy Wilkinson 20f0b41099 Upgrade CI to Docker 19.03.9 
Closes gh-21681
 2020-06-05 12:48:49 +01:00
Phillip Webb 7561123cd9 Merge branch '2.2.x' into 2.3.x 
Closes gh-21709
 2020-06-04 20:10:18 -07:00
Phillip Webb 10fdd65063 Add prepare-forward-merge script 
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
 2020-06-04 20:10:09 -07:00
Phillip Webb ba53d10060 Merge branch '2.2.x' into 2.3.x 
Closes gh-21706
 2020-06-04 20:07:13 -07:00
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns 
Closes gh-21687
 2020-06-04 20:05:17 -07:00
Phillip Webb 4a6e08c817 Add logging to forward-merge script 
Add some logging to aid with development.
 2020-06-04 20:05:01 -07:00
Phillip Webb 4a0d372675 Merge branch '2.2.x' into 2.3.x 2020-06-04 14:00:57 -07:00
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 2020-06-04 13:59:14 -07:00
Andy Wilkinson 24138c104c Use highlightjs for syntax highlighting in Asciidoctor's HTML output 
Closes gh-21701
 2020-06-04 20:25:29 +01:00
Andy Wilkinson c0f748e143 Always apply retry plugin but only retry on CI 
Previously, the retry plugin was only applied on CI as we do not want
tests to be retried in local builds. Unfortunately, this arrangement
led to test tasks from CI builds having additional doFirst and doLast
actions and an additional property. These differences meant that the
output from a test task that has run on CI could not be used by a
local build.

This commit changes our configuration of the test retry plugin so
that it is now always applied. To retain the behaviour of only
retrying tests on CI, max retries is configured to 3 on CI and 0 for
local builds.

Closes gh-21698
 2020-06-04 16:10:12 +01:00