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

1040 Commits

Author SHA1 Message Date
Andy Wilkinson ef67838f14 Merge branch '3.1.x' 
Closes gh-38376
 2023-11-16 14:40:39 +00:00
Andy Wilkinson 4a38d032af Restore use of avg in JPA smoke test 
Closes gh-34895
 2023-11-16 14:40:13 +00:00
Scott Frederick 586bb26eff Polish "Use KafkaContainer in smoke test for Kafka with SSL" 
See gh-38359
 2023-11-15 15:25:58 -06:00
Eddú Meléndez 51f13404a5 Use KafkaContainer in smoke test for Kafka with SSL 
See gh-38359
 2023-11-15 15:25:58 -06:00
Phillip Webb 0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Claudio Nave 61aecdedd6 Remove Liquibase javax.activation excludes 
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487) so we
can now remove our exclusions.

See gh-38274
 2023-11-09 11:44:31 -08:00
Scott Frederick 759d096867 Disable Kafka SSL smoke test when Docker is not available 
See gh-38260
 2023-11-08 13:18:12 -06:00
Scott Frederick f22c1ba7d6 Add smoke test for Kafka with SSL 
Closes gh-38260
 2023-11-07 11:21:20 -06:00
Moritz Halbritter 0621288544 Merge branch '3.1.x' 
Closes gh-38224
 2023-11-06 09:02:03 +01:00
Moritz Halbritter 9cbc686499 Merge branch '3.0.x' into 3.1.x 
Closes gh-38223
 2023-11-06 09:01:56 +01:00
Moritz Halbritter a006b26437 Merge branch '2.7.x' into 3.0.x 
Closes gh-38222
 2023-11-06 09:01:46 +01:00
Christoph Dreis 3f7ece5418 Remove obsolete spring-boot-deployment-tests directory 
See gh-38207
 2023-11-06 09:00:39 +01:00
Phillip Webb d638bbb0ba Merge branch '3.1.x' 
Closes gh-37967
 2023-10-19 21:25:44 -07:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Phillip Webb 062b544447 Upgrade to Ubuntu Jammy 20231004 
Closes gh-37957
 2023-10-18 21:19:51 -07:00
Phillip Webb 55968ef995 Upgrade to Ubuntu Jammy 20231004 
Closes gh-37949
 2023-10-18 21:17:24 -07:00
Phillip Webb 812023a84b Upgrade to Ubuntu Jammy 20231004 
Closes gh-37952
 2023-10-18 21:13:42 -07:00
Phillip Webb c7d6fbcb3a Upgrade to Ubuntu Jammy 20231004 
See gh-37954
 2023-10-18 21:10:00 -07:00
Phillip Webb 3c62defb9d Support java.nio.file Paths and FileSystems with nested jars 
Add a `NestedFileSystemProvider` implementation so that the JDK's
`ZipFileSystem` can load content from nested jars and nested
directory entries.

Creating a `ZipFileSystem` may be a relatively expensive operation as
zip structures need to be parsed and in the case of directory entries
a virtual datablock nees to be generated on the fly. As such, we
install the `ZipFileSystem` as late as possible since in a typical
application it may never be needed.

This commit also tweaks Gradle and Maven plugins to ensure that the
service loader file is written to repackaged jars.

Closes gh-7161
 2023-10-18 20:46:36 -07:00
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
Scott Frederick 5556739c8c Add SSL bundle support to Rabbit auto-configuration 2023-10-11 15:39:51 -05:00
Phillip Webb 927ece3bfc Merge branch '3.1.x' 2023-10-10 12:31:44 -07:00
Phillip Webb 01128465ff Merge branch '3.0.x' into 3.1.x 2023-10-10 12:31:28 -07:00
Phillip Webb 885189a1b4 Merge branch '2.7.x' into 3.0.x 2023-10-10 12:30:11 -07:00
Phillip Webb f04d354c29 Attempt to fix download cache on CI 
See gh-37450
 2023-10-10 11:46:20 -07:00
Andy Wilkinson 48059417b5 Upgrade to Kafka 3.6.0 
Closes gh-37777
 2023-10-09 13:46:52 +01:00
Phillip Webb 6c24ea01f1 Add BouncyCastle nested jar verification test including on Oracle JDK 
Update `spring-boot-loader-tests` with a test that checks verified
BouncyCastle jars can be loaded. Currently the Oracle JDK only supports
verification if the jar is unpacked.

See gh-28837
 2023-10-05 22:13:31 -07:00
Phillip Webb 79d2208908 Merge branch '3.1.x' 2023-10-05 22:10:34 -07:00
Phillip Webb 1b1c1f1b64 Merge branch '3.0.x' into 3.1.x 2023-10-05 22:10:22 -07:00
Phillip Webb 3c31a6fc3b Merge branch '2.7.x' into 3.0.x 2023-10-05 22:10:14 -07:00
Phillip Webb c37290bc6c Fix Oracle JDK download URL 
See gh-37450
 2023-10-05 22:09:45 -07:00
Phillip Webb b0b3adb1b7 Merge branch '3.1.x' 
Closes gh-37741
 2023-10-05 21:30:43 -07:00
Phillip Webb 2a35667295 Merge branch '3.0.x' into 3.1.x 
Closes gh-37740
 2023-10-05 21:30:10 -07:00
Phillip Webb 30af19acc2 Merge branch '2.7.x' into 3.0.x 
Closes gh-37739
 2023-10-05 20:54:09 -07:00
Phillip Webb a33ce9d405 Cache JDK downloads for tests that use ImageFromDockerfile 
Update `spring-boot-launch-script-tests` and `spring-boot-loader-tests`
so that JDK archives are now downloaded by Gradle and cached across
builds.

Closes gh-37450
 2023-10-05 20:49:02 -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
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
Phillip Webb 780f75d5a2 Polish 2023-10-02 23:01:21 -07:00
Phillip Webb e3036dcb99 Merge branch '3.1.x' 
Closes gh-37658
 2023-10-02 23:00:15 -07:00
Phillip Webb 904bd52260 Merge branch '3.0.x' into 3.1.x 
Closes gh-37657
 2023-10-02 22:59:57 -07:00
Phillip Webb 7bb60fc7c7 Merge branch '2.7.x' into 3.0.x 
Closes gh-37656
 2023-10-02 22:59:45 -07:00
Phillip Webb ed4ab667a1 Enable LoaderIntegrationTests on aarch64 
Closes gh-37654
 2023-10-02 22:42:21 -07:00
Moritz Halbritter a7373c182a Merge branch '3.1.x' 
Closes gh-37523
 2023-09-22 08:42:18 +02:00
Moritz Halbritter b5ec0c2f5d Merge branch '3.0.x' into 3.1.x 
Closes gh-37522
 2023-09-22 08:42:08 +02:00
Moritz Halbritter 58941d85f2 Merge branch '2.7.x' into 3.0.x 
Closes gh-37521
 2023-09-22 08:41:58 +02:00
Moritz Halbritter f96690348f Use Bellsoft JDK 21 in LoaderIntegrationTests 
Closes gh-35900
 2023-09-22 08:35:22 +02:00
Andy Wilkinson dc9a48030c Merge branch '3.0.x' into 3.1.x 2023-09-13 13:37:41 +01:00
Andy Wilkinson 3eb89343d0 Merge branch '2.7.x' into 3.0.x 2023-09-13 13:37:31 +01:00
Andy Wilkinson c4368bc934 Run LoaderIntegrationTests on Java 21 
See gh-37359
 2023-09-13 13:36:04 +01:00
Johnny Lim c2b78830ff Polish 
See gh-37340
 2023-09-13 10:26:54 +02:00
Andy Wilkinson a84e2db285 Merge branch '3.1.x' 2023-09-08 11:47:42 +01:00
Andy Wilkinson c5908811ab Merge branch '3.0.x' into 3.1.x 2023-09-08 11:47:03 +01:00
Andy Wilkinson b29b35905c Merge branch '2.7.x' into 3.0.x 2023-09-08 11:45:46 +01:00
Andy Wilkinson 2656f02001 Fix launch script integration tests on Intel Macs 
Closes gh-36799
 2023-09-08 11:45:25 +01:00
Andy Wilkinson ed5d16de84 Upgrade to Jetty 12 
Closes gh-36073
 2023-09-07 13:59:15 +01:00
Phillip Webb 750c597225 Polish 'Add Pulsar ConnectionDetails support' 
See gh-37197
 2023-09-06 12:18:09 -07:00
Chris Bono 089fef0392 Add Pulsar ConnectionDetails support 
Add `ConnectionDetails` support for Apache Pulsar and provide adapters
for Docker Compose and Testcontainers.

See gh-37197
 2023-09-06 12:12:25 -07:00
Phillip Webb 9497f3d91c Polish "Combine Pulsar smoke tests" 
See gh-37196
 2023-09-05 20:42:14 -07:00
Chris Bono eacf92b1b2 Combine Pulsar smoke tests 
* Simplify produce/consume verify via OutputCapture

* Remove spring-boot-smoke-test-pulsar-reactive as
  no other smoke tests split them out

See gh-37196
 2023-09-05 20:41:43 -07:00
Phillip Webb 2ebcdb059a Tweak Pulsar smoke test timeouts 
See gh-34763
 2023-09-05 18:46:58 -07:00
Phillip Webb 975cb27905 Protect against concurrent list updates in Pulsar samples 
See gh-34763
 2023-09-05 18:23:39 -07:00
Chris Bono 6e7b845bdf Add support for Apache Pulsar 
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.

See gh-34763

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2023-09-05 17:01:51 -07:00
Moritz Halbritter e532b3b830 Merge branch '3.1.x' 
Closes gh-37141
 2023-08-30 14:16:32 +02:00
Moritz Halbritter 4a88604a01 Merge branch '3.0.x' into 3.1.x 
Closes gh-37140
 2023-08-30 14:16:07 +02:00
Moritz Halbritter c749fcb478 Merge branch '2.7.x' into 3.0.x 
Closes gh-37139
 2023-08-30 14:15:27 +02:00
Moritz Halbritter 0f6342a882 Make JarLaunchScript and SysVinit integration tests ARM64 compatible 
Closes gh-36799
 2023-08-30 14:01:32 +02:00
Andy Wilkinson bc88a133d3 Merge branch '3.1.x' 
Closes gh-36869
 2023-08-09 13:44:14 +01:00
Andy Wilkinson fc91a84219 Merge branch '3.0.x' into 3.1.x 
Closes gh-36868
 2023-08-09 13:44:00 +01:00
Andy Wilkinson 1b7467adc3 Merge branch '2.7.x' into 3.0.x 
Closes gh-36867
 2023-08-09 13:43:51 +01:00
Andy Wilkinson 1765f4e9cf Ensure that server tests run when test apps have changed 
Closes gh-19858
 2023-08-09 13:43:24 +01:00
Moritz Halbritter 7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Stephane Nicoll 191ac10009 Deprecate support for OkHttp 
Closes gh-36632
 2023-08-01 16:45:13 +02:00
Moritz Halbritter f85a7258a6 Polish SampleAmqpSimpleApplication 2023-07-27 16:32:53 +02:00
Stephane Nicoll 94d9148de6 Merge branch '3.1.x' 
Closes gh-36613
 2023-07-27 14:55:56 +02:00
Stephane Nicoll 6f22baa729 Merge branch '3.0.x' into 3.1.x 
Closes gh-36612
 2023-07-27 14:55:29 +02:00
Stephane Nicoll 150526a6a0 Merge branch '2.7.x' into 3.0.x 
Closes gh-36611
 2023-07-27 14:52:37 +02:00
Stephane Nicoll 87554fb4dc Add test for RabbitMQ smoke test 
Closes gh-36610
 2023-07-27 14:51:50 +02:00
Johnny Lim 96c9915f12 Polish 
See gh-36565
 2023-07-26 10:00:56 +02:00
Scott Frederick c600be74ff Merge branch '3.1.x' 
Closes gh-36542
 2023-07-24 16:06:13 -05:00
Scott Frederick bb4226397a Merge branch '3.0.x' into 3.1.x 
Closes gh-36541
 2023-07-24 16:05:57 -05:00
Scott Frederick c5d2415834 Merge branch '2.7.x' into 3.0.x 
Closes gh-36540
 2023-07-24 16:04:28 -05:00
Scott Frederick 90be62bc7a Update Docker images used for launch script tests 
Closes gh-24349
 2023-07-24 15:46:30 -05:00
Stephane Nicoll 311fa6272d Polish "Add service connection for Testcontainers ActiveMQ" 
This also adds support for Docker Compose.

See gh-35080
 2023-07-20 13:03:41 +02:00
Eddú Meléndez 63121dd08a Add service connection for Testcontainers ActiveMQ 
See gh-35080
 2023-07-20 13:03:41 +02:00
Phillip Webb ae6b1f91f6 Merge branch '3.1.x' 2023-07-18 10:32:06 +01:00
Phillip Webb 28b5b7a218 Merge branch '3.0.x' into 3.1.x 2023-07-18 10:32:01 +01:00
Phillip Webb 9d91dbc4e5 Use explicit matchers following Spring Security 6.0.5 upgrade 
See gh-36293
 2023-07-18 10:31:41 +01:00
Phillip Webb 49f82717d1 Merge branch '3.1.x' 2023-07-18 10:17:17 +01:00
Phillip Webb 30cc2a48c7 Merge branch '3.0.x' into 3.1.x 2023-07-18 10:16:56 +01:00
Phillip Webb 0233178855 Use explicit matchers following Spring Security 6.0.5 upgrade 
See gh-36293
 2023-07-18 09:49:11 +01:00
Andy Wilkinson c3e2c9d684 Polish "Support Jetty in ClientHttpRequestFactories" 
See gh-36116
 2023-07-04 17:49:07 +01:00
Johnny Lim 7c77e1bb85 Polish 'Log correlation IDs when Micrometer tracing is being used' 
See gh-36158
 2023-07-02 20:08:45 +01:00
Andy Wilkinson 6d8ca7286a Merge branch '3.1.x' 
Closes gh-36128
 2023-06-30 08:26:26 +01:00
Andy Wilkinson a268c6433e Merge branch '3.0.x' into 3.1.x 
Closes gh-36127
 2023-06-30 08:26:12 +01:00
Andy Wilkinson 93f8bd2170 Merge branch '2.7.x' into 3.0.x 
Closes gh-36126
 2023-06-30 08:25:53 +01:00