Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,793 Commits 23 Branches 0 Tags
b1044ca8833bdb7d63d680c1cb2bba3c4223165f
Commit Graph

26793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll
721399bdc4 Merge branch '2.3.x' 2020-06-05 14:54:55 +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
8353dea111 Merge branch '2.3.x' 2020-06-05 14:49:55 +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
292f549cd2 Merge branch '2.3.x' 
Closes gh-21719
 2020-06-05 13:41:56 +01: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
Stephane Nicoll
6db4103b26 Merge pull request #21545 from izeye 
* pr/21545:
  Polish "Support filtered scrape for Prometheus"
  Support filtered scrape for Prometheus
  Upgrade CI to Docker 19.03.9

Closes gh-21545
 2020-06-05 14:16:49 +02:00
Stephane Nicoll
da5e8d70a1 Polish "Support filtered scrape for Prometheus" 
See gh-21545
 2020-06-05 14:16:42 +02:00
Johnny Lim
cd1baf18fe Support filtered scrape for Prometheus 
See gh-21545
 2020-06-05 14:16:42 +02:00
Andy Wilkinson
c848f80c27 Merge branch '2.3.x' 
Closes gh-21680
 2020-06-05 12:53:05 +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
Stephane Nicoll
78165c619d Merge pull request #21605 from dreis2211 
* pr/21605:
  Fix multi-release JAR test on JDK 15

Closes gh-21605
 2020-06-05 13:07:31 +02:00
dreis2211
54f93e9b0f Fix multi-release JAR test on JDK 15 
See gh-21605
 2020-06-05 11:56:50 +02:00
Phillip Webb
2fe299f6d0 Merge branch '2.3.x' 
Closes gh-21710
 2020-06-04 20:10:59 -07: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
87a155410b Merge branch '2.3.x' 
Closes gh-21707
 2020-06-04 20:08:20 -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
c666f0ff05 Merge branch '2.3.x' 2020-06-04 14:03:59 -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