Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
53,566 Commits 23 Branches 0 Tags
8daf7323c3e0812d0e9bf880206bb045ebe74d27
Commit Graph

53566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Nicoll
8daf7323c3 Merge branch '3.4.x' 
Closes gh-44730
 2025-03-17 09:02:23 +01:00
Stéphane Nicoll
0ca4be2d52 Merge branch '3.3.x' into 3.4.x 
Closes gh-44729
 2025-03-17 09:02:00 +01:00
Stéphane Nicoll
15efbd675f Merge pull request #44725 from quaff 
* pr/44725:
  Update copyright year of changed files
  Polish usage of @ConfigurationProperties

Closes gh-44725
 2025-03-17 09:01:52 +01:00
Stéphane Nicoll
6ec6132cc2 Update copyright year of changed files 
See gh-44725
 2025-03-17 09:01:35 +01:00
Yanming Zhou
fa9c1f0c41 Polish usage of @ConfigurationProperties 
See gh-44725

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-17 09:01:08 +01:00
Moritz Halbritter
6d2fb65340 Merge branch '3.4.x' 
Closes gh-44728
 2025-03-17 08:55:25 +01:00
Moritz Halbritter
01719c41fa Merge branch '3.3.x' into 3.4.x 
Closes gh-44727
 2025-03-17 08:55:16 +01:00
Moritz Halbritter
135fb1a254 Merge pull request #44718 from KmYgJn 
* pr/44718:
  Fix Integer conversion in getProgress() method

Closes gh-44718
 2025-03-17 08:52:24 +01:00
youngjin_dev
a164dab25d Fix Integer conversion in getProgress() method 
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
 2025-03-17 08:52:15 +01:00
Phillip Webb
951e7abfbc Merge branch '3.4.x' 2025-03-14 17:24:51 -07:00
Phillip Webb
14e00c0c75 Merge branch '3.3.x' into 3.4.x 2025-03-14 17:24:26 -07:00
Phillip Webb
109e4c8572 Update copyright year of changed files 2025-03-14 17:24:06 -07:00
Phillip Webb
2e0f6f87d8 Merge branch '3.4.x' 2025-03-14 15:44:29 -07:00
Phillip Webb
5d688502ae Polish 2025-03-14 15:44:23 -07:00
Phillip Webb
a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb
6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb
896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll
f21304e5cf Merge branch '3.4.x' 2025-03-14 17:07:04 +01:00
Stéphane Nicoll
af18d8a884 Merge branch '3.3.x' into 3.4.x 2025-03-14 17:06:59 +01:00
Stéphane Nicoll
b691d2b89b Upgrade to Spring Framework 6.2.4 
Closes gh-44517
 2025-03-14 17:06:32 +01:00
Stéphane Nicoll
611a46cd81 Upgrade to Spring Data Bom 2025.0.0-M2 
Closes gh-44592
 2025-03-14 17:06:32 +01:00
Stéphane Nicoll
e851832efe Upgrade to Spring Data Bom 2024.1.4 
Closes gh-44569
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll
4c5ceb8c33 Upgrade to AspectJ 1.9.23 
Closes gh-44720
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll
2d6eb6618b Upgrade to Spring Data Bom 2024.0.10 
Closes gh-44561
 2025-03-14 16:59:43 +01:00
Stéphane Nicoll
e90e6355ed Upgrade to AspectJ 1.9.23 
Closes gh-44719
 2025-03-14 16:59:43 +01:00
Moritz Halbritter
e6dd61a5a6 Merge branch '3.4.x' 
Closes gh-44717
 2025-03-14 14:53:52 +01:00
Moritz Halbritter
a2a0adea8a Merge branch '3.3.x' into 3.4.x 
Closes gh-44716
 2025-03-14 14:53:40 +01:00
Moritz Halbritter
09b3461394 Remove use of self-signed.badssl.com 
Closes gh-43708
 2025-03-14 14:45:14 +01:00
Moritz Halbritter
9cf9b0b5ef Merge pull request #44637 from quaff 
* pr/44637:
  Introduce PollerMetadataCustomizer for Spring Integration

Closes gh-44637
 2025-03-14 14:08:08 +01:00
Yanming Zhou
81048b42ca Introduce PollerMetadataCustomizer for Spring Integration 
See gh-44637

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-14 13:58:21 +01:00
Stéphane Nicoll
8a72a33051 Upgrade to Native Build Tools Plugin 0.10.6 
Closes gh-44709
 2025-03-14 10:49:07 +01:00
Stéphane Nicoll
a1abd69257 Upgrade to AspectJ 1.9.23 
Closes gh-44715
 2025-03-14 10:49:06 +01:00
Moritz Halbritter
d005e958d9 Merge branch '3.4.x' 2025-03-13 12:11:24 +01:00
Moritz Halbritter
84612f36ce Move UseApr enum inside the Tomcat class 
See gh-44033
 2025-03-13 12:03:27 +01:00
Stéphane Nicoll
5bc6355cfc Merge branch '3.4.x' 2025-03-13 11:28:29 +01:00
Stéphane Nicoll
75413d9a70 Merge branch '3.3.x' into 3.4.x 2025-03-13 11:27:46 +01:00
Moritz Halbritter
3bd75f6ce5 Revert back to the custom decode method for Otel decoding 
https://github.com/spring-projects/spring-framework/issues/34570

See gh-44677
 2025-03-13 11:26:23 +01:00
Stéphane Nicoll
1d284198bf Upgrade to Spring Framework 6.2.4 
Closes gh-44442
 2025-03-13 11:09:29 +01:00
Stéphane Nicoll
6f0ed7325e Upgrade to Native Build Tools Plugin 0.10.6 
Closes gh-44708
 2025-03-13 11:09:29 +01:00
Stéphane Nicoll
3c8e65c2b4 Upgrade to Spring Framework 6.1.18 
Closes gh-44491
 2025-03-13 11:08:54 +01:00
Stéphane Nicoll
92754353f6 Upgrade to Native Build Tools Plugin 0.10.6 
Closes gh-44707
 2025-03-13 11:08:54 +01:00
Moritz Halbritter
03974f2f87 Merge pull request #44677 from nosan 
* pr/44677:
  Polish OpenTelemetryResourceAttributes

Closes gh-44677
 2025-03-13 10:39:34 +01:00
Dmytro Nosan
9229cb5cd7 Polish OpenTelemetryResourceAttributes 
Update OpenTelemetryResourceAttributes to use StringUtils.uriDecode(...)
as it provides the same functionality as the custom decode(...) method.

See gh-44677

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-13 10:38:56 +01:00
Moritz Halbritter
cfd62cbc69 Merge pull request #44655 from nosan 
* pr/44655:
  Polish "Introduce properties for configuring the OpenTelemetry BatchSpanProcessor"
  Introduce properties for configuring the OpenTelemetry BatchSpanProcessor

Closes gh-44655
 2025-03-13 10:21:39 +01:00
Moritz Halbritter
79030e6b5f Polish "Introduce properties for configuring the OpenTelemetry BatchSpanProcessor" 
See gh-44655
 2025-03-13 10:21:19 +01:00
Dmytro Nosan
ea4822177f Introduce properties for configuring the OpenTelemetry BatchSpanProcessor 
This commit adds the following properties to allow customization
of the BatchSpanProcessor:

- management.tracing.opentelemetry.export.include-unsampled
- management.tracing.opentelemetry.export.timeout
- management.tracing.opentelemetry.export.max-batch-size
- management.tracing.opentelemetry.export.max-queue-size
- management.tracing.opentelemetry.export.schedule-delay

Default values were taken from BatchSpanProcessorBuilder.

See gh-44655

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-13 10:15:58 +01:00
Moritz Halbritter
a53aba6abc Merge branch '3.4.x' 
This sets the default value of 'server.tomcat.use-apr' to 'NEVER'.

Closes gh-44705
 2025-03-13 08:58:18 +01:00
Moritz Halbritter
7fcf34eaeb Add property 'server.tomcat.use-apr' to control Tomcat's APR 
The property's default depends on the Java version. On Java < 24, it defaults
to WHEN_AVAILABLE, on Java >=24 it defaults to NEVER.

Closes gh-44033
 2025-03-13 08:40:16 +01:00
Andy Wilkinson
19c386040b Merge branch '3.4.x' 
Closes gh-44698
 2025-03-12 15:49:41 +00:00
Andy Wilkinson
59ddba1063 Merge branch '3.3.x' into 3.4.x 
Closes gh-44697
 2025-03-12 15:48:36 +00:00