Commit Graph

38385 Commits

Author SHA1 Message Date
Andy Wilkinson
ab93bc26c7 Merge branch '2.7.x'
Closes gh-31271
2022-06-08 12:18:36 +01:00
Andy Wilkinson
a0fee42740 Merge branch '2.6.x' into 2.7.x
Closes gh-31270
2022-06-08 12:09:14 +01:00
Andy Wilkinson
4c23d2c45b Merge pull request #31267 from vpavic
* gh-31267:
  Polish "Update smoke tests to avoid conflicts with NAME environment variable"
  Update smoke tests to avoid conflicts with NAME environment variable

Closes gh-31267
2022-06-08 12:08:57 +01:00
Andy Wilkinson
0834dc5b01 Polish "Update smoke tests to avoid conflicts with NAME environment variable"
See gh-31267
2022-06-08 12:08:40 +01:00
Vedran Pavic
95e0d6c0f7 Update smoke tests to avoid conflicts with NAME environment variable
This commit updates several smoke tests in order to avoid conflicts
with NAME environment variable that is present in WSL and causes
project build to fail. Previous attempt to fix this in 7da42d71 was
incomplete.

See gh-31267
2022-06-08 11:34:19 +01:00
Stephane Nicoll
8413002bcb Polish
See gh-31247
2022-06-07 20:02:06 +02:00
Andy Wilkinson
869bb91c80 Polish 2022-06-07 17:52:11 +01:00
Stephane Nicoll
ac16432fad Add AOT support for immutable ConfigurationProperties bean definitions
This commit introduces a dedicated AotProcessors for immutable
configuration properties beans as their bean definition use an
instance supplier that needs special handling. If such a bean definition
is detected, dedicated code is generated that replicates the behavior
of the instance supplier.

Closes gh-31247
2022-06-07 14:26:35 +02:00
Brian Clozel
3f0c14187a Register runtime hints for @ConfigurationProperties
Prior to this commit, the `@ConfigurationProperties` annotation would
not be registered for reflection hints: this means it could be missing
at runtime in a native image and would not be registered for JDK
proxying - this can fail the synthesized annotation resolution.

This commit ensures that hints are registered for this annotation if
configuration properties are declared in the bean factory.

Fixes gh-31227
2022-06-07 09:50:56 +02:00
Stephane Nicoll
e2c42e4bbf Merge branch '2.7.x'
Closes gh-31262
2022-06-07 09:16:19 +02:00
Stephane Nicoll
8e550933a8 Merge branch '2.6.x' into 2.7.x
Closes gh-31261
2022-06-07 09:16:10 +02:00
Stephane Nicoll
bbb5966bca Upgrade integration tests to Apache Maven 3.8.5
Closes gh-31260
2022-06-07 09:15:41 +02:00
Stephane Nicoll
1c94f835c7 Copy AOT-generated classes
Closes gh-31245
2022-06-07 08:59:57 +02:00
Andy Wilkinson
11cbb2549e Merge branch '2.7.x'
Closes gh-31256
2022-06-06 17:03:41 +01:00
Andy Wilkinson
c379456722 Remove dependency management for spring-ldap-ldif-batch
The spring-ldap-ldif-batch module was removed in Spring LDAP 2.4.0 in
favor of the equivalent code that already exists in Spring Batch.
This commit aligns Boot's dependency management with this removal.

Closes gh-31254
2022-06-06 17:01:28 +01:00
Stephane Nicoll
c996e4335a Fix singleton handling of ConfigurationProperties hints
Closes gh-31248
2022-06-04 12:29:45 +02:00
Stephane Nicoll
cf19c176f6 Adapt test to change in Spring Framework snapshots 2022-06-03 18:11:10 +02:00
Stephane Nicoll
2a405c94a8 Add missing test
Closes gh-31249
2022-06-03 17:41:29 +02:00
Stephane Nicoll
fb439b6824 Permit AOT-generated code to run on the JVM as well
This commit updates the codebase so that AOT-generated code can run on
the JVM in an opt-in fashion alongside the existing support of native
images.

When optimizations have been generated, setting the "spring.aot.enabled"
spring property (JVM or spring.properties) allows to opt-in for that
behavior on the JVM.

Closes gh-31244
2022-06-03 10:10:56 +02:00
Stephane Nicoll
0dbcb5f6d3 Start building against Spring Framework 6.0.0-M5 snapshots
See gh-31241
2022-06-02 16:19:58 +02:00
Phillip Webb
13fba65638 Polish 2022-06-01 09:53:21 -07:00
Phillip Webb
6d80723598 Relocate AotProcessingHook
Relocate `AotProcessingHook` to be an static class of `AotProcessor`.
2022-05-31 15:51:12 -07:00
Stephane Nicoll
6e9ea85835 Adapt BasePackages bean definition for AOT processing
This commit adapts how the BasePackages bean is registered so that
AOT processing works with it out-of-the-box. Previously we were using
an instance supplier with the accumulated base packages. This commit
changes that to set a constructor argument values.

Closes gh-31223
2022-05-31 15:19:35 +02:00
Andy Wilkinson
4385926df1 Ensure that the main application class can be deduced
Closes gh-31222
2022-05-31 12:06:56 +01:00
Andy Wilkinson
5f54289e97 Allow WebApplicationType to be deduced in a native image
Closes gh-31217
2022-05-31 11:39:42 +01:00
Stephane Nicoll
44a8e91b9e Prevent main method to continue once the AOT context has been optimized
This commit makes sure that processing of the main method upon
completion of SpringApplication#run. Previously, any instructions in
the user's main method were invoked, which is not suitable to build-time
processing.

Closes gh-31219
2022-05-31 12:34:37 +02:00
Andy Wilkinson
d044eaf69d Merge branch '2.7.x'
Closes gh-31221
2022-05-31 11:21:52 +01:00
Andy Wilkinson
7f291f8da0 Merge branch '2.6.x' into 2.7.x
Closes gh-31220
2022-05-31 11:14:08 +01:00
Andy Wilkinson
348662b15e Remove unused deduceFromApplicationContext and supporting code
Closes gh-31218
2022-05-31 10:57:22 +01:00
Andy Wilkinson
1ba1eff63a Merge branch '2.7.x' 2022-05-30 19:22:45 +01:00
Andy Wilkinson
430040415b Merge branch '2.6.x' into 2.7.x 2022-05-30 19:22:37 +01:00
Andy Wilkinson
0b6c147a87 Polish 2022-05-30 19:22:30 +01:00
Andy Wilkinson
12465ea6b7 Merge branch '2.7.x'
Closes gh-31214
2022-05-30 18:24:12 +01:00
Andy Wilkinson
d1420b6abb Merge branch '2.6.x' into 2.7.x
Closes gh-31213
2022-05-30 18:24:00 +01:00
Andy Wilkinson
da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
2022-05-30 18:19:47 +01:00
Andy Wilkinson
85ad4fd4b4 Merge branch '2.7.x'
Closes gh-31212
2022-05-30 17:17:26 +01:00
Andy Wilkinson
70bcade232 Merge branch '2.6.x' into 2.7.x
Closes gh-31211
2022-05-30 17:16:53 +01:00
Andy Wilkinson
419ac26e0d Use conventions for source and encoding of aggregatedJavadoc
Closes gh-31210
2022-05-30 17:15:45 +01:00
Stephane Nicoll
b2e63db57f Merge branch '2.7.x'
Closes gh-31209
2022-05-30 15:14:23 +02:00
Stephane Nicoll
dd437c4cf4 Merge branch '2.6.x' into 2.7.x
Closes gh-31208
2022-05-30 15:14:08 +02:00
Stephane Nicoll
51893c4bba Merge pull request #31197 from 1993heqiang
* pr/31197:
  Upgrade copyright year of changed files
  Polish "Remove boxing"

Closes gh-31197
2022-05-30 15:14:00 +02:00
Stephane Nicoll
ad1214c972 Upgrade copyright year of changed files
See gh-31197
2022-05-30 15:13:12 +02:00
heqiang
3a0ab01066 Polish "Remove boxing"
See gh-31197
2022-05-30 15:02:58 +02:00
Stephane Nicoll
a27427b977 Merge branch '2.7.x'
Closes gh-31207
2022-05-30 14:57:57 +02:00
Stephane Nicoll
95dad34482 Merge branch '2.6.x' into 2.7.x
Closes gh-31206
2022-05-30 14:57:45 +02:00
Stephane Nicoll
35fb4f4bd3 Merge pull request #31203 from matei-cernaianu
* pr/31203:
  Fix "spring.factories" typos in database initialization documentation

Closes gh-31203
2022-05-30 14:57:35 +02:00
Matei Cernăianu
eb8b9e17c5 Fix "spring.factories" typos in database initialization documentation
See gh-31203
2022-05-30 14:55:15 +02:00
Andy Wilkinson
d354c03e63 Merge branch '2.7.x'
Closes gh-31191
2022-05-27 15:58:57 +01:00
Andy Wilkinson
682ac53f32 Ensure that config processor runs with only AutoConfiguration
Fixes gh-31186
2022-05-27 15:58:00 +01:00
Andy Wilkinson
f433d250e1 Merge branch '2.7.x'
Closes gh-31189
2022-05-27 11:14:40 +01:00