Commit Graph

9397 Commits

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
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
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
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
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
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
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
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
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
dreis2211
54f93e9b0f Fix multi-release JAR test on JDK 15
See gh-21605
2020-06-05 11:56:50 +02:00
Andy Wilkinson
c4faeac4d7 Merge branch '2.3.x'
Closes gh-21703
2020-06-04 20:27:18 +01: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
Phillip Webb
16cab0d83c Merge branch '2.3.x'
Closes gh-21690
2020-06-03 19:20:01 -07:00
Phillip Webb
4d37430bfe Use servlet context that can access classloader
Update `SpringBootServletInitializer` to use the `ServletContext` that
was provided to the initial `onStartup` call rather than the
one from the `ServletContextEvent`. This allows the `getClassLoader()`
call to complete without throwing an `UnsupportedOperationException`.

Fixes gh-21684
2020-06-03 19:18:12 -07:00
Scott Frederick
87f5894a9a Merge branch '2.3.x'
Closes gh-21685
2020-06-03 16:54:37 -05:00
Scott Frederick
29253264b4 Improve Docker API 5xx error messages
This commit improves the error messages returned by the Spring Boot
build plugins when a 5xx status code is returned from the Docker
API while attempting to build an image. If the error response has
contents containing a JSON structure with a "message" key, the value
associated with that key will be included in the exception message
and in the build plugin output error.

Fixes gh-21515
2020-06-03 16:53:44 -05:00
Andy Wilkinson
933a85144a Merge branch '2.3.x'
Closes gh-21669
2020-06-03 13:07:35 +01:00
Andy Wilkinson
daeca9f332 Restore Boot 2.2's compile-scoped dependencies
Fixes gh-21507
2020-06-03 12:55:11 +01:00
Andy Wilkinson
f041be8877 Merge branch '2.3.x'
Closes gh-21668
2020-06-03 11:46:59 +01:00
Andy Wilkinson
210e565741 Use dirMode and fileMode to configure CLI archive entry permissions
Closes gh-21453
2020-06-03 11:46:01 +01:00
Andy Wilkinson
38b91f134e Merge branch '2.3.x'
Closes gh-21665
2020-06-03 09:26:29 +01:00
Andy Wilkinson
a2bfdb5b33 Merge branch '2.2.x' into 2.3.x
Closes gh-21663
2020-06-03 08:13:44 +01:00
Andy Wilkinson
29c2a0471d Add Oracle DB dependency management under com.oracle.database
Closes gh-20333
2020-06-03 08:06:26 +01:00
Phillip Webb
39216ce3f4 Merge branch '2.3.x' 2020-06-02 22:48:16 -07:00
Phillip Webb
e39d7971fb Merge branch '2.2.x' into 2.3.x 2020-06-02 22:48:01 -07:00
Phillip Webb
864daab03a Merge branch '2.1.x' into 2.2.x 2020-06-02 22:47:41 -07:00
Phillip Webb
b5fe3c3494 Refine YAML type restriction error
Closes gh-21596
2020-06-02 22:46:47 -07:00
Phillip Webb
20c11a3cbd Merge branch '2.3.x'
Closes gh-21661
2020-06-02 22:29:38 -07:00
Phillip Webb
ebb3f5f286 Merge branch '2.2.x' into 2.3.x
Closes gh-21660
2020-06-02 22:28:39 -07:00
Phillip Webb
4fc0dec6c4 Support wrapped random property sources
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
2020-06-02 22:22:40 -07:00
Madhura Bhave
e0f548fdd3 Merge branch '2.3.x'
Closes gh-21657
2020-06-02 17:24:20 -07:00
Madhura Bhave
2dc8048d08 Add missing since tags
Closes gh-21576
2020-06-02 17:22:46 -07:00
Phillip Webb
fc8fdf2de0 Merge branch '2.3.x'
Closes gh-21656
2020-06-02 10:59:35 -07:00
Phillip Webb
2589f980d5 Merge branch '2.2.x' into 2.3.x
Closes gh-21655
2020-06-02 10:58:36 -07:00
Phillip Webb
09a47c9aad Fix containsDescendantOf for random sources
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
2020-06-02 10:57:48 -07:00
Andy Wilkinson
399d0f7b95 Merge branch '2.3.x'
Closes gh-21651
2020-06-02 09:42:34 +01:00