Commit Graph

39227 Commits

Author SHA1 Message Date
Phillip Webb
dd98b88732 Fix 'Align MimeMappings with Tomcat's defaults'
Update COMMON_MAPPINGS to align with the properties file and change
the test so that it consistently works.

See gh-32101
2022-08-23 16:38:31 -07:00
Phillip Webb
fe1ffff3d7 Merge branch '2.7.x'
Closes gh-32158
2022-08-23 16:11:27 -07:00
Phillip Webb
5f2f6d32cf Merge branch '2.6.x' into 2.7.x
Closes gh-32157
2022-08-23 16:11:13 -07:00
Phillip Webb
ec65b293bf Merge pull request #32123 from dsyer
* pr/32123:
  Polish 'Add JVM options to prevent warnings with asciidoctor'
  Add JVM options to prevent warnings with asciidoctor

Closes gh-32123
2022-08-23 16:10:36 -07:00
Phillip Webb
546d7b41e9 Polish 'Add JVM options to prevent warnings with asciidoctor'
See gh-32123
2022-08-23 16:09:58 -07:00
Dave Syer
7b4db4cafc Add JVM options to prevent warnings with asciidoctor
See gh-32123
2022-08-23 16:09:45 -07:00
Phillip Webb
90b68d8465 Merge pull request #32101 from terminux
* pr/32101:
  Polish 'Align MimeMappings with Tomcat's defaults'
  Align MimeMappings with Tomcat's defaults

Closes gh-32101
2022-08-23 11:38:22 -07:00
Phillip Webb
86f38e15f0 Polish 'Align MimeMappings with Tomcat's defaults'
Refine `MimeMappings` so that common default mappings are included
by default and the complete set is only loaded when needed.

The `TomcatServletWebServerFactory` has been updated so that if
`TomcatEmbeddedContext` is in use the mime mapping are used
directly rather than being copied to another Map.

The `AbstractServletWebServerFactory` class has also been changed
to use a lazy copy of the mappings. This should mean that the
complete set of properties is only loaded if the user mutates
the mappings.

See gh-32101
2022-08-23 11:37:16 -07:00
Guirong Hu
7728ae4e00 Align MimeMappings with Tomcat's defaults
Update `MimeMappings` to align with the default values used in
Tomcat. The mime mapping are now loaded from a properties file
and a test has been added to ensure that they remain in sync
with Tomcat's defaults.

See gh-32101
2022-08-23 10:15:41 -07:00
Stephane Nicoll
c67010ddd1 Make test more robust 2022-08-23 14:45:52 +02:00
Moritz Halbritter
0cc0b48a67 Add runtime hints for freemarker
Registers reflection hints for the FreeMarkerTemplateAvailabilityProperties
class.

Closes gh-32052
2022-08-23 09:23:42 +02:00
Moritz Halbritter
7a8d7a9cd9 Polish TemplateAvailabilityProviders 2022-08-23 09:20:29 +02:00
Stephane Nicoll
4413a4b1a8 Merge branch '2.7.x' 2022-08-23 08:26:33 +02:00
Stephane Nicoll
4d2d0dedc8 Merge branch '2.6.x' into 2.7.x 2022-08-23 08:26:23 +02:00
Stephane Nicoll
50c099334b Adapt deprecated getIpAddress call with getHost in Redis Tests
Closes gh-32147
2022-08-23 08:25:52 +02:00
Stephane Nicoll
d637fe37cc Merge branch '2.7.x'
Closes gh-32146
2022-08-23 07:25:57 +02:00
Stephane Nicoll
7a91fa90d5 Merge branch '2.6.x' into 2.7.x
Closes gh-32145
2022-08-23 07:25:45 +02:00
Stephane Nicoll
463766fd44 Merge pull request #32144 from russellyou
* pr/32144:
  Polish "Allow Netty default leak detection to be overidden"
  Allow Netty default leak detection to be overidden

Closes gh-32144
2022-08-23 07:25:39 +02:00
Stephane Nicoll
7f2d4fceec Polish "Allow Netty default leak detection to be overidden"
See gh-32144
2022-08-23 07:20:49 +02:00
Russell You
51f2e40c69 Allow Netty default leak detection to be overidden
See gh-32144
2022-08-23 07:12:24 +02:00
Stephane Nicoll
b19f1cedb3 Merge branch '2.7.x'
Closes gh-32137
2022-08-22 16:09:07 +02:00
Stephane Nicoll
392aec4a78 Merge pull request #32131 from thegeekyasian
* pr/32131:
  Adapt deprecated getIpAddress call with getHost in Redis Tests

Closes gh-32131
2022-08-22 16:07:35 +02:00
thegeekyasian
5b1c6381db Adapt deprecated getIpAddress call with getHost in Redis Tests
See gh-32131
2022-08-22 16:06:21 +02:00
Stephane Nicoll
639f980876 Avoid proxy on Validator in ValidationAutoConfiguration
Closes gh-32134
2022-08-22 14:44:18 +02:00
Stephane Nicoll
82a9c219e1 Merge branch '2.7.x'
Closes gh-32129
2022-08-22 06:38:52 +02:00
Stephane Nicoll
a6350b5992 Merge branch '2.6.x' into 2.7.x
Closes gh-32128
2022-08-22 06:38:38 +02:00
Stephane Nicoll
6d80b601b6 Upgrade to Testcontainers 1.17.3
Closes gh-32127
2022-08-22 06:37:56 +02:00
Scott Frederick
2cdaab59f6 Merge branch '2.7.x'
Closes gh-32122
2022-08-19 13:57:26 -05:00
Scott Frederick
c16094e04b Disable SELinux label security policy when building images
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
2022-08-19 13:56:34 -05:00
Stephane Nicoll
e3ddb54cb8 Adapt JPA auto-configuration to PersistenceManagedTypes
This commit exposes a PersistenceManagedTypes bean with the entities
to consider in a typical auto-configuration scenario. This allows the
result of the scanning to be optimized AOT, if necessary.

Closes gh-32119
2022-08-19 16:17:44 +02:00
Stephane Nicoll
f2f5bae314 Add native hints for default LDIF file
Closes gh-32084
2022-08-18 15:31:58 +02:00
Stephane Nicoll
c41609d01d Polish 2022-08-18 09:44:55 +02:00
Stephane Nicoll
9630f853be Merge branch '2.7.x' 2022-08-18 09:30:02 +02:00
Stephane Nicoll
238493a7d4 Merge branch '2.6.x' into 2.7.x 2022-08-18 09:29:51 +02:00
Spring Builds
e8eeec1c3d Next development version (v2.7.4-SNAPSHOT) 2022-08-18 06:09:57 +00:00
Spring Builds
a9c71a7b86 Next development version (v2.6.12-SNAPSHOT) 2022-08-18 04:20:21 +00:00
Phillip Webb
07c0a8bced Fix SecurityManager deprecation issues
See gh-32086
2022-08-17 13:22:40 -07:00
Phillip Webb
4ec2e357d9 Merge branch '2.7.x'
See gh-32086
2022-08-17 12:49:52 -07:00
Phillip Webb
60e1cc510c Merge branch '2.6.x' into 2.7.x
See gh-32085
2022-08-17 12:48:21 -07:00
Phillip Webb
13bd61b6fe Revert nested jar fixes
Revert the recent updates to nested jar support that were intended
to allow verification of signed unpacked nested jars on Oracle JDK.

Unfortunately the changes caused a number of regressions which
affected a larger number of users than those that have issues with
signed jars.

Closes gh-31853
2022-08-17 12:43:48 -07:00
Phillip Webb
bd74344025 Revert "Don't close jar files early"
This reverts commit b42f056ddb.
2022-08-17 11:38:42 -07:00
Phillip Webb
674022d401 Revert "Don't close nested jars or wrapper when parent is closed"
This reverts commit 360eb027be.
2022-08-17 11:37:19 -07:00
Stephane Nicoll
24a52aa66d Annotate actuator internal infrastructure with @Reflective
This commit simplifies the registration of hints for the infrastructure
of the Actuator that is invoked via reflection.
2022-08-17 17:25:06 +02:00
Stephane Nicoll
6d6270edaf Start building against Spring LDAP 3.0.0-M4 snapshots
See gh-32105
2022-08-17 14:45:01 +02:00
Stephane Nicoll
4823b8ef7b Merge branch '2.7.x'
Closes gh-32104
2022-08-17 13:33:33 +02:00
Stephane Nicoll
3fcfcc4a3b Merge branch '2.6.x' into 2.7.x
Closes gh-32103
2022-08-17 13:33:24 +02:00
Stephane Nicoll
3b01325c6b Use asList consistently
Closes gh-32102
2022-08-17 13:32:36 +02:00
Stephane Nicoll
e6977777cc Merge branch '2.7.x'
Closes gh-32100
2022-08-17 09:10:13 +02:00
Stephane Nicoll
ca63a6e9ad Merge branch '2.6.x' into 2.7.x
Closes gh-32099
2022-08-17 09:10:02 +02:00
Stephane Nicoll
191593cf15 Review Git contribution documentation
Closes gh-31904
2022-08-17 08:58:56 +02:00