root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
47,291 Commits 23 Branches 345 Tags 268 MiB
Commit Graph

1130 Commits

Author SHA1 Message Date
Phillip Webb 33c5e1269a Write signature files to uber jars to for Oracle Java 17 verification 
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.

This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:

	if (!jarManifestNameChecked && SharedSecrets
			.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
    	throw new JarException("The JCE Provider " + jarURL.toString() +
    		" is not signed.");
	}

The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".

Fixes gh-28837
 2023-10-16 16:19:16 -07:00
Andy Wilkinson d6a9295c26 Allow additional build info properties to have provided values 
Closes gh-37889
 2023-10-16 18:15:42 +01:00
Andy Wilkinson 084bd3a420 Merge branch '3.1.x' 2023-10-13 21:38:06 +01:00
Andy Wilkinson ccaa54436b Merge branch '3.0.x' into 3.1.x 2023-10-13 21:37:56 +01:00
Andy Wilkinson b1eb08faba Merge branch '2.7.x' into 3.0.x 2023-10-13 21:37:44 +01:00
Andy Wilkinson 3dba0d76d2 Polish 
See gh-37878
 2023-10-13 21:17:12 +01:00
Andy Wilkinson 2231244d2c Merge branch '3.1.x' 2023-10-13 20:42:15 +01:00
Andy Wilkinson e957c3087c Merge branch '3.0.x' into 3.1.x 2023-10-13 20:36:51 +01:00
Andy Wilkinson c25e532aeb Merge branch '2.7.x' into 3.0.x 2023-10-13 20:36:32 +01:00
Andy Wilkinson dbc06faed8 Polish 
See gh-37878
 2023-10-13 20:36:16 +01:00
Andy Wilkinson 60f05eaa94 Merge branch '3.1.x' 
Closes gh-37882
 2023-10-13 16:01:47 +01:00
Andy Wilkinson 5af13d191f Merge branch '3.0.x' into 3.1.x 
Closes gh-37881
 2023-10-13 16:01:32 +01:00
Andy Wilkinson ae2693b7f1 Merge branch '2.7.x' into 3.0.x 
Closes gh-37880
 2023-10-13 16:01:14 +01:00
Andy Wilkinson 42ee6b9e74 Use new permissions API with Gradle 8.3+ 
Closes gh-37878
 2023-10-13 16:00:54 +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
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 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 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
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
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 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 89a86e91f5 Avoid deprecation warning with Gradle 8.4-rc-1 
Closes gh-37493
 2023-09-22 15:31:36 +01:00
Scott Frederick 7de770f6a1 Add support for security options in CNB builder container config 
Closes gh-37479
 2023-09-20 13:43:36 -05:00
Scott Frederick 4433fcd1f2 Add support for build workspace option when building images 
Closes gh-37478
 2023-09-20 13:43:35 -05:00
Andy Wilkinson 44bc47d96d Merge branch '3.1.x' 
Closes gh-37381
 2023-09-14 11:03:25 +01:00
Andy Wilkinson dfb95329fd Merge branch '3.0.x' into 3.1.x 
Closes gh-37380
 2023-09-14 11:03:08 +01:00
Andy Wilkinson a795065555 Polish "Lazily query attributes when copying from base configuration" 
See gh-37343
 2023-09-14 10:32:05 +01:00
Fouad Almalki 7edc9ebc28 Lazily query attributes when copying from base configuration 
See gh-37343
 2023-09-14 10:30:11 +01:00
Scott Frederick a9f26e0f95 Conditionally enable image building bind cache tests 
Accessing bind mount directories as is done in the tests for building
images with bind mount caches requires Docker configuration when
using Docker Desktop. It works without configuration on Linux with
Docker Engine.

See gh-28387
 2023-09-12 17:00:59 -05:00
Andy Wilkinson f45a32d911 Merge branch '3.1.x' 
Closes gh-37175
 2023-09-01 14:18:23 +01:00
Andy Wilkinson a84ee2fb12 Merge branch '3.0.x' into 3.1.x 
Closes gh-37174
 2023-09-01 14:17:59 +01:00
Andy Wilkinson 3ab1dfb9dc Merge branch '2.7.x' into 3.0.x 
Closes gh-37173
 2023-09-01 14:17:40 +01:00
Andy Wilkinson a77863245d Polish "Use project.getLayout().getBuildDirectory() instead of getBuildDir()" 
See gh-37167
 2023-09-01 14:15:33 +01:00
Yanming Zhou a8706962d4 Use project.getLayout().getBuildDirectory() instead of getBuildDir() 
See gh-37167
 2023-09-01 14:08:16 +01:00
Scott Frederick c17ecf0f0b Add support for caching to bind mounts when building images 
When building an image using the Maven `spring-boot:build-image` goal or
the Gradle `bootBuildImage` task, the build and launch caches can be
configured to use a bind mount as an alternative to using a named
volume.

Closes gh-28387
 2023-08-21 15:04:39 -05:00
Stephane Nicoll d9cc6e810f Merge branch '3.0.x' into 3.1.x 
Closes gh-37027
 2023-08-18 14:31:51 +02:00
Stephane Nicoll 1f6d0600b5 Merge branch '2.7.x' into 3.0.x 
Closes gh-37026
 2023-08-18 14:15:48 +02:00
Stephane Nicoll 6efd9ed0b0 Test Gradle plugin against Gradle 8.3 
Closes gh-37025
 2023-08-18 14:05:50 +02:00
Scott Frederick eb45aab712 Upgrade default CNB builders to Paketo Jammy 
Closes gh-36689
 2023-08-14 13:29:42 -05:00
Moritz Halbritter e4484c3db5 Use constants in SpringBootAotPlugin 2023-08-08 13:12:48 +02:00
Moritz Halbritter 7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Moritz Halbritter ed9169501e Polish 2023-08-08 13:12:47 +02:00
Andy Wilkinson b1d26fe961 Revert "Upgrade default CNB builders to Paketo Jammy" 
This reverts commit 6506208d29. The
upgrade to the Jammy builder was causing
failsWhenBuildImageIsInvokedOnMultiModuleProjectWithBuildImageGoal to
hang on CI.

See gh-36689
 2023-08-07 12:10:27 +01:00
Scott Frederick 6506208d29 Upgrade default CNB builders to Paketo Jammy 
Closes gh-36689
 2023-08-02 19:06:16 -05:00
Andy Wilkinson 21ce7a08fc Polish "Polish" 
See gh-36620
 2023-07-28 11:40:34 +01:00
Johnny Lim 5a205dbfd1 Polish 
See gh-36620
 2023-07-28 11:35:33 +01:00
Andy Wilkinson 12254b11ce Don't run KotlinPluginActionITs on JVMs not support by Gradle 7.6 2023-07-21 16:24:32 +01:00
Andy Wilkinson 2029117999 Upgrade to Kotlin 1.9.0 
Closes gh-36362
 2023-07-19 20:27:41 +01:00
Scott Frederick 4393a2244c Use Docker CLI context to determine daemon host address for image building 
Configuration files managed by the Docker CLI are now used to determine
the host address of the Docker daemon used when building images using
buildpacks when a host address is not configured with environment
variables or build tool plugin configuration.

Closes gh-36445
 2023-07-18 13:21:01 -06:00
Andy Wilkinson ce8253ea95 Merge branch '3.1.x' 
Closes gh-36238
 2023-07-05 09:51:35 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x 
Closes gh-36237
 2023-07-05 09:47:43 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList() 
See gh-36167
 2023-07-05 09:38:19 +01:00
Andy Wilkinson fc403f4f18 Merge branch '3.1.x' 2023-06-21 13:15:06 +01:00
Andy Wilkinson d3522a78a8 Merge branch '3.0.x' into 3.1.x 2023-06-21 13:14:46 +01:00
Andy Wilkinson 641f00f24c Disable test when Java version is too high 
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.

See gh-35931
 2023-06-21 13:12:20 +01:00
Andy Wilkinson ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1 
Closes gh-35977
Closes gh-35980
 2023-06-19 18:12:16 +01:00
Scott Frederick e8301a065f Merge branch '3.0.x' into 3.1.x 
Closes gh-35932
 2023-06-16 16:10:48 -05:00
Scott Frederick fbba2df7bf Enable Gradle plugin tests on Java 20 
Closes gh-35931
 2023-06-16 16:10:24 -05:00
Andy Wilkinson cdcebe452c Polish "Test Gradle plugin against Gradle 8.2-rc-1" 
See gh-35708
 2023-06-05 10:59:30 +01:00
Andy Wilkinson 45ce18e1c7 Polish "Test Gradle plugin against Gradle 8.2-rc-1" 
See gh-35708
 2023-06-02 15:35:34 +01:00
Andy Wilkinson d6192a0fa1 Merge branch '3.0.x' 
Closes gh-35708
 2023-06-02 15:18:13 +01:00
Andy Wilkinson 5a793a6d49 Merge branch '2.7.x' into 3.0.x 
Closes gh-35707
 2023-06-02 15:17:35 +01:00
Andy Wilkinson 5623fe3b94 Test Gradle plugin against Gradle 8.2-rc-1 
Closes gh-35699
 2023-06-02 13:23:36 +01:00
Phillip Webb ae90add7c7 Polish 2023-05-16 14:04:48 -07:00
Andy Wilkinson 37cc6b6a70 Merge branch '3.0.x' 
Closes gh-35444
 2023-05-16 09:27:30 +01:00
Andy Wilkinson c39a37cd23 Exclude developmentOnly dependences from AOT processing classpaths 
Fixes gh-35433
 2023-05-16 09:26:20 +01:00
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Johnny Lim ff9fd1abeb Polish 
See gh-35185
 2023-05-10 08:31:36 +02:00
Andy Wilkinson 93c3116b3a Fix failsGracefullyWhenNoTestMainMethodIsFound on Windows 2023-05-09 16:56:18 +01:00
Andy Wilkinson 07a11045d9 Merge branch '3.0.x' 
Closes gh-35328
 2023-05-05 17:35:50 +01:00
Andy Wilkinson fd864c35aa Improve mapping of resolved artifacts to dependency coordinates 
Closes gh-31216
 2023-05-05 17:32:59 +01:00
Andy Wilkinson 19d7973776 Add bootTestRun to run app using test source set output and classpath 
Closes gh-35248
 2023-05-04 15:27:10 +01:00
Phillip Webb d86e82d026 Merge branch '3.0.x' 2023-05-02 15:42:05 -07:00
Phillip Webb 2c27ec5b7b Merge branch '2.7.x' into 3.0.x 2023-05-02 15:42:00 -07:00
Phillip Webb b3226c55d2 Polish 2023-05-02 15:41:55 -07:00
Scott Frederick 23ae91b008 Add native image manifest entry 
A manifest entry `Spring-Boot-Native-Processed: true` is added to the
jar manifest by the Maven or Gradle plugin when the jar has been built
for use in a native image. With the Gradle plugin, this is done in
reaction to the GraalVM Native Image Plugin being applied to the
project. With the Maven plugin, this is done when the `native` profile
is applied to the build.
 2023-05-02 15:11:49 -05:00
Moritz Halbritter 9d50d92b9c Merge branch '3.0.x' 2023-05-02 16:36:49 +02:00
Moritz Halbritter 1f4a337ad2 Merge branch '2.7.x' into 3.0.x 2023-05-02 16:17:50 +02:00
Moritz Halbritter 091d6204cb Disable build image integration tests on aarch64 linux and mac 
See gh-35229
 2023-05-02 15:38:42 +02:00
Stephane Nicoll 16563a6a0a Upgrade to Native Build Tools Plugin 0.9.21 
Closes gh-35055
 2023-04-18 13:45:53 +02:00
Andy Wilkinson 2b4f565b76 Merge branch '3.0.x' 
Closes gh-35038
 2023-04-17 17:52:11 +01:00
Andy Wilkinson df93b39f60 Merge branch '2.7.x' into 3.0.x 
Closes gh-35037
 2023-04-17 17:51:53 +01:00
Andy Wilkinson d6bbbb8bac Merge branch '3.0.x' 
Closes gh-35036
 2023-04-17 17:49:55 +01:00
Andy Wilkinson 284e4d6f6d Merge branch '2.7.x' into 3.0.x 
Closes gh-35035
 2023-04-17 17:46:33 +01:00
Andy Wilkinson 88ec47ff2b Test Gradle plugin against Gradle 8.1 
Closes gh-35034
 2023-04-17 17:38:28 +01:00
Andy Wilkinson 751fc9fe54 Fix includeProjectDependencies with Kotlin DSL 2023-04-17 17:35:15 +01:00