Commit Graph

28378 Commits

Author SHA1 Message Date
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
2020-12-17 20:43:41 -08:00
Madhura Bhave 361198ebba Fix tests
See gh-11987
2020-12-16 15:25:02 -08:00
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
2020-12-16 14:55:36 -08:00
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
2020-12-16 15:58:53 -06:00
Phillip Webb 2cd1459a9a Merge pull request #24532 from dreis2211
* pr/24532:
  Avoid duplicates in MergedContextConfiguration

Closes gh-24532
2020-12-16 13:09:58 -08:00
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
2020-12-16 12:50:54 -08:00
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
2020-12-16 13:23:43 -06:00
Phillip Webb 29300530c6 Polish 2020-12-15 19:44:40 -08:00
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix
Closes gh-24486
2020-12-15 17:20:21 +00:00
Stephane Nicoll 39751fd692 Merge branch '2.2.x' into 2.3.x
Closes gh-24513
2020-12-15 16:17:27 +01:00
Stephane Nicoll 7194210762 Remove reference to java14 in CI scripts
Closes gh-24472
2020-12-15 16:16:02 +01:00
Madhura Bhave e5e654c9ee Merge branch '2.2.x' into 2.3.x
Closes gh-24500
2020-12-14 12:08:33 -08:00
Madhura Bhave 822ae0daf7 Fix detection of latest GA for SDKMAN
Fixes gh-24475
2020-12-14 12:07:15 -08:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll 4f3c7f9e56 Merge branch '2.2.x' into 2.3.x 2020-12-14 14:32:05 +01:00
Stephane Nicoll 40fd71bc05 Switch master branch to 2.5.x 2020-12-14 14:31:25 +01:00
Stephane Nicoll 492df2259b Upgrade Java 11 version in CI image
Closes gh-24463
2020-12-11 08:37:50 +01:00
Stephane Nicoll c416a40469 Upgrade Java 8 version in CI image
Closes gh-24464
2020-12-11 08:37:08 +01:00
Stephane Nicoll d0b11bdcf4 Upgrade Ubuntu version in CI images
Closes gh-24465
2020-12-11 08:36:33 +01:00
Stephane Nicoll d6f15c3924 Upgrade CI to Docker 19.03.14
Close gh-24462
2020-12-11 08:35:19 +01:00
Stephane Nicoll 1b1cdea660 Merge branch '2.2.x' into 2.3.x 2020-12-11 08:35:08 +01:00
Stephane Nicoll d24bb94c62 Upgrade Java 11 version in CI image
Closes gh-24457
2020-12-11 08:25:24 +01:00
Stephane Nicoll 588090994d Upgrade Java 8 version in CI image
Closes gh-24456
2020-12-11 08:24:52 +01:00
Stephane Nicoll 0db6891808 Upgrade Ubuntu version in CI images
Closes gh-24460
2020-12-11 08:24:09 +01:00
Stephane Nicoll 37e601f128 Upgrade CI to Docker 19.03.14
Closes gh-24459
2020-12-11 08:22:55 +01:00
Spring Buildmaster b638962d36 Next development version (v2.3.8.BUILD-SNAPSHOT) 2020-12-11 06:00:03 +00:00
Phillip Webb 235f4a7415 Merge branch '2.2.x' into 2.3.x 2020-12-10 21:05:31 -08:00
Phillip Webb 1f8a6ddaaf Write docker/config.json for CI Image generation
See gh-24461
2020-12-10 21:00:58 -08:00
Phillip Webb 743fedc0ea Merge branch '2.2.x' into 2.3.x 2020-12-10 18:52:31 -08:00
Phillip Webb ff124c0902 Use GitHub token rather than password
See gh-24458
2020-12-10 18:51:47 -08:00
Phillip Webb 305694e162 Merge branch '2.2.x' into 2.3.x 2020-12-10 18:22:35 -08:00
Phillip Webb babae118fc Attempt to fix oci-build-task config
See gh-24197
2020-12-10 16:40:44 -08:00
Phillip Webb b953c41a5f Attempt to fix oci-build-task config
See gh-24197
2020-12-10 16:31:37 -08:00
Phillip Webb 398c6b3603 Attempt to fix oci-build-task config
See gh-24197
2020-12-10 16:20:37 -08:00
Phillip Webb 615d054dec Attempt to fix oci-build-task config
See gh-24197
2020-12-10 15:58:19 -08:00
Phillip Webb 6990fff27a Attempt to fix oci-build-task config
See gh-24197
2020-12-10 14:35:04 -08:00
Phillip Webb cae5ed81cd Fix README 2020-12-10 14:13:05 -08:00
Phillip Webb c14be4e84b Generate CI images with oci-build-task
Update CI to generate images using an `oci-build-task` since
the `registry-image` resource cannot perform actual image builds.

See gh-24197
2020-12-10 14:10:17 -08:00
Phillip Webb fa44a1d0c5 Migrate to registry-image in task yaml
See gh-24197
2020-12-10 14:09:55 -08:00
Madhura Bhave aa24d623fe Merge branch '2.2.x' into 2.3.x 2020-12-10 12:37:16 -08:00
Madhura Bhave 5cab547fe4 Fix SDKMAN automation 2020-12-10 12:36:22 -08:00
Madhura Bhave 5da22b5bff Fix syntax in bash script 2020-12-10 10:42:12 -08:00
Madhura Bhave 2e8d26150b Add git-repo as input to sdkman 2020-12-10 10:33:00 -08:00
Stephane Nicoll 360013cba4 Merge branch '2.2.x' into 2.3.x 2020-12-10 18:31:32 +01:00
Stephane Nicoll 793bfff2c8 Polish
See gh-21903
2020-12-10 18:20:33 +01:00
Spring Buildmaster cab98450e5 Next development version (v2.2.13.BUILD-SNAPSHOT) 2020-12-10 16:19:46 +00:00
Stephane Nicoll 5b88a1908a Upgrade to Gradle 6.7.1
Closes gh-24450
2020-12-10 15:46:42 +01:00
Stephane Nicoll e2435117e1 Merge branch '2.2.x' into 2.3.x 2020-12-10 15:44:30 +01:00
Stephane Nicoll 0533ac58fb Test the Gradle plugin against 6.7.1
Closes gh-24449
2020-12-10 15:33:37 +01:00