fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,203 Commits 22 Branches 339 Tags
Commit Graph

2990 Commits

Author SHA1 Message Date
Andy Wilkinson
781ac2ece2 Merge branch '2.7.x' into 3.0.x 
Closes gh-37828
 2023-10-11 15:02:36 +01:00
Andy Wilkinson
5a75fae23b Polish "Polish" 
See gh-37745
 2023-10-11 14:58:04 +01:00
Johnny Lim
303015ea2d Polish 
See gh-37745
 2023-10-11 14:57:38 +01:00
Andy Wilkinson
d0486ef43f Merge branch '3.1.x' 
Closes gh-37827
 2023-10-11 14:47:35 +01:00
Andy Wilkinson
40461488db Merge branch '3.0.x' into 3.1.x 
Closes gh-37826
 2023-10-11 14:47:23 +01:00
Andy Wilkinson
a80f8ea5e6 Configure Java toolchain on AOT-processing tasks 
Closes gh-37717
 2023-10-11 14:31:44 +01:00
Andy Wilkinson
b9a0159b97 Merge branch '3.1.x' 
Closes gh-37825
 2023-10-11 13:54:39 +01:00
Andy Wilkinson
ac1f7ccc33 Merge branch '3.0.x' into 3.1.x 
Closes gh-37824
 2023-10-11 13:54:25 +01:00
Andy Wilkinson
5a6cd77c56 Merge branch '2.7.x' into 3.0.x 
Closes gh-37823
 2023-10-11 13:54:11 +01:00
Andy Wilkinson
5a1abb76f7 Test the Gradle plugin against Gradle 8.4 
Closes gh-37811
 2023-10-11 13:52:03 +01:00
Phillip Webb
9e4f160c17 Attempt to fix NestedJarFile file lock issues on Windows 
Update `DefaultCleanerTracking` and `@AssertFileChannelDataBlocksClosed`
to capture and store the source object if it is a `Cleanable` so that
it can be released later.

Although the real cleaner cannot keep a reference to `obj`, it is safe
for us to do so in tests since we are in control of the object lifecycle
and we don't need it to be garbage collected.

This commit also updates the `UrlJarFile` to call the cleaner so that
it can be tracked.

See gh-37668
 2023-10-06 23:44:55 -07:00
Phillip Webb
5da31aca46 Attempt to fix NestedJarFile file lock issues on Windows 
Update `NestedJarFile.close()` to call `super.close()` so that the outer
jar file is closed and files can hopefully be deleted on Windows.

See gh-37668
 2023-10-06 21:47:55 -07:00
Phillip Webb
1f5472387d Fix formatting 2023-10-03 20:41:48 -07:00
Phillip Webb
42f50fa292 Attempt to fix CI failures 
Attempt to fix CI failures caused by timezone differences and different
JDK versions.

See gh-37668
 2023-10-03 20:29:33 -07:00
Phillip Webb
7ad4a9817d Rewrite nested jar support code and remove Java 8 support 
Rewrite nested jar code to better align with the implementations
provided in Java 17. This update makes two fundamental changes to
the previous implementation:

- Resource cleanup is now handled using the `java.lang.ref.Cleaner`

- Jar URLs now use the form `jar:nested:/my.jar/!nested.jar!/entry`

Unlike the previous `jar🫙/my,jar!/nested.jar!/entry` URL format,
the new format is compatible with Java's default Jar URL handler.
Specifically, it now only uses a single `jar:` prefix and it no longer
includes multiple `!/` separators.

In addition to the changes above, many of the ancillary classes have
also been refactored and updated to create cleaner APIs.

Closes gh-37668
 2023-10-03 17:27:57 -07:00
Phillip Webb
75ddb9fa47 Fix test failure caused by PropertiesLoader class reference 
See gh-37667
 2023-10-03 17:27:39 -07:00
Phillip Webb
55b5610dd9 Add Maven and Gradle option for the loader implementation to use 
Add properties to the Maven and Gradle plugins so that users can
switch between the two loader modules.

See gh-37669
 2023-10-03 15:40:42 -07:00
Phillip Webb
a89057b7c7 Reintroduce spring-boot-loader modules 
Restore the `spring-boot-loader` with the previous loader code so
that we can develop it further.

See gh-37669
 2023-10-03 15:40:25 -07:00
Phillip Webb
aeb6537f57 Rename spring-boot-loader to spring-boot-loader-classic 
Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.

See gh-37669
 2023-10-03 15:40:04 -07:00
Phillip Webb
c22548982a Relocate launcher classes 
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.

This update is designed to improve compatibility with future
changes in the loader.

Closes gh-37667
 2023-10-03 14:53:04 -07:00
Scott Frederick
f947bad3f7 Merge branch '3.1.x' 
Closes gh-37666
 2023-10-03 13:18:32 -05:00
Ivo Smid
f2a4336ea1 Increase the socket timeout for remote connections to Docker daemon 
The default socket timeout with HttpClient 5 is not long enough
in some cases where Docker images are built that require the
GraalVM native image compiler to run in a buildpack. This commit
increases the timeout to 30 minutes.

Fixes gh-37665

Co-authored-by: Scott Frederick <sfrederick@vmware.com>"
 2023-10-03 11:52:48 -05:00
Andy Wilkinson
7d40a45b50 Merge branch '3.1.x' 
Closes gh-37662
 2023-10-03 11:21:29 +01:00
Andy Wilkinson
a4100e12ff Merge branch '3.0.x' into 3.1.x 
Closes gh-37661
 2023-10-03 11:05:51 +01:00
Andy Wilkinson
931584f8af Merge branch '2.7.x' into 3.0.x 
Closes gh-37659
 2023-10-03 10:28:51 +01:00
Phillip Webb
3d6859e80f Use the term "uber jar" in reference documentation and javadoc 
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".

Closes gh-37653
 2023-10-02 23:01:34 -07:00
Scott Frederick
619a0f3b35 Merge branch '3.1.x' 
Closes gh-37624
 2023-09-28 16:32:45 -05:00
JinseongHwang
0b703f9007 Use consistent capitalization in MySQL and MariaDB test names 
See gh-37497
 2023-09-28 16:28:32 -05:00
Andy Wilkinson
bebca55a8f Add testAndDevelopmentOnly configuration 
Closes gh-35436
 2023-09-28 13:24:34 +01:00
Phillip Webb
052757c2d8 Polish 2023-09-27 20:58:09 -07:00
Scott Frederick
3cf08e1351 Clarify default security options for image building 
See gh-37479
 2023-09-27 11:05:40 -05:00
Scott Frederick
9811cc030f Fix LifecycleTests for security options on Windows 
Fixes gh-37598
 2023-09-27 10:09:44 -05:00
Scott Frederick
7c23c0b3c2 Merge branch '3.1.x' 2023-09-26 18:51:03 -05:00
Scott Frederick
5ae4ba83a7 Merge branch '3.0.x' into 3.1.x 2023-09-26 18:19:48 -05:00
Scott Frederick
7e29a3c70b Use latest available Gradle version for Paketo system tests 
This ensures that the tests will run with the latest Java versions.

See gh-37507
 2023-09-26 18:19:25 -05:00
Scott Frederick
d37e9424a2 Merge branch '3.1.x' 
Closes gh-37589
 2023-09-26 14:07:16 -05:00
Scott Frederick
4f8684fd69 Merge branch '3.0.x' into 3.1.x 
Closes gh-37588
 2023-09-26 14:07:05 -05:00
Scott Frederick
a03e3320a6 Merge branch '2.7.x' into 3.0.x 
Closes gh-37587
 2023-09-26 14:06:50 -05:00
Scott Frederick
aeeb5cf1f8 Apply Gradle fileMode and dirMode consistently in jar and war archives 
Fixes gh-37496
 2023-09-26 13:49:19 -05:00
Scott Frederick
c45ad6ce83 Use actual Java version in build image integration tests 
See gh-37453
 2023-09-22 13:38:37 -05:00
Scott Frederick
e80f743648 Merge branch '3.1.x' 
Closes gh-37551
 2023-09-22 11:37:00 -05:00
Scott Frederick
3803bd9af9 Merge branch '3.0.x' into 3.1.x 
Closes gh-37550
 2023-09-22 11:32:28 -05:00
Scott Frederick
7322c078c4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37549
 2023-09-22 11:32:07 -05:00
Scott Frederick
98bfaf0412 Remove compatibility blocks from Gradle plugin integration tests 
Closes gh-37453
 2023-09-22 11:28:12 -05:00
Andy Wilkinson
fb15125d01 Merge branch '3.1.x' 
Closes gh-37548
 2023-09-22 16:30:36 +01:00
Andy Wilkinson
8080bb9cfb Merge branch '3.0.x' into 3.1.x 
Closes gh-37547
 2023-09-22 16:30:19 +01:00
Johnny Lim
ce813346c9 Add Javadoc since for AbstractAotMojo.getSession() 
See gh-37462
 2023-09-22 16:29:49 +01:00
Andy Wilkinson
af495b2dc0 Merge branch '3.1.x' 
Closes gh-37546
 2023-09-22 16:26:48 +01:00
Andy Wilkinson
e4d8b22403 Merge branch '3.0.x' into 3.1.x 
Closes gh-37545
 2023-09-22 16:26:31 +01:00
Andy Wilkinson
333820627f Merge branch '2.7.x' into 3.0.x 
Closes gh-37544
 2023-09-22 16:26:21 +01:00