root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
26,824 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

26824 Commits

Author SHA1 Message Date
Andy Wilkinson a192dcb742 Merge branch '2.2.x' into 2.3.x 
Closes gh-21752
 2020-06-08 14:30:05 +01:00
Andy Wilkinson ad158ee729 Merge branch '2.1.x' into 2.2.x 
Closes gh-21751
 2020-06-08 14:29:53 +01:00
Andy Wilkinson 020a47ba3e Document support for Gradle 5 
Closes gh-15358
 2020-06-08 14:29:07 +01:00
Andy Wilkinson 82b531b49e Merge branch '2.2.x' into 2.3.x 2020-06-08 11:35:53 +01:00
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson 6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb 8ac8329ee6 Merge pull request #21381 from evgeniycheban 
* pr/21381:
  Polish 'Support userInfo in elasticsearch URI'
  Support userInfo in elasticsearch URI

Closes gh-21381
 2020-06-07 11:57:32 -07:00
Phillip Webb f8982bdc14 Polish 'Support userInfo in elasticsearch URI' 
See gh-21381
 2020-06-07 11:56:18 -07:00
Evgeniy Cheban a72179aa4f Support userInfo in elasticsearch URI 
See gh-21381
 2020-06-07 10:38:41 -07:00
Phillip Webb abaca95467 Merge branch '2.2.x' into 2.3.x 
Closes gh-21744
 2020-06-07 10:27:35 -07:00
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21743
 2020-06-07 10:25:33 -07:00
Phillip Webb 70e0a27949 Drop the use of the term "white list" 
Closes gh-21737
 2020-06-07 10:22:35 -07:00
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 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