root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
29,859 Commits 18 Branches 337 Tags 370 MiB
Commit Graph

213 Commits

Author SHA1 Message Date
Stéphane Nicoll 2d6b77336b Revert Upgrad to Jetty Reactive Httpclient 4.0.2 
Upgrading leads to to WebClientIntegrationTests to fail with Jetty and
the build does not complete properly. This commit reverts the upgrade.

See gh-31931
 2024-01-01 11:22:25 +01:00
Juergen Hoeller 243ec88e95 Upgrade to SLF4J 2.0.10, AspectJ 1.9.21, Groovy 4.0.17, Tomcat 10.1.17, Jetty 12.0.5, Netty 4.1.104, Jackson 2.15.3, Protobuf 3.25.1, OpenPDF 1.3.35 2023-12-30 16:47:50 +01:00
Juergen Hoeller 7adc2f0779 Upgrade to Tomcat 10.1.16 and Jetty 12.0.4 2023-12-12 14:26:56 +01:00
Stéphane Nicoll 33b28fe5bf Upgrade to Reactor 2023.0.1 
Closes gh-31814
 2023-12-12 13:58:24 +01:00
Brian Clozel f0abdf2264 Upgrade to Mockito 5.8.0 
See gh-31459
 2023-12-12 11:22:41 +01:00
Brian Clozel c7f24efc27 Upgrade to Groovy 4.0.16 
See gh-31459
 2023-12-12 11:22:07 +01:00
Stéphane Nicoll f962211e0a Start building against Reactor 2023.0.1 snapshots 
See gh-31814
 2023-12-11 15:00:19 +01:00
Stéphane Nicoll 6077c998d1 Upgrade to Micrometer 1.12.1 
Closes gh-31813
 2023-12-11 14:55:55 +01:00
Juergen Hoeller b0e29acd23 Upgrade to SmallRye Mutiny 1.10.0 2023-11-16 11:22:01 +01:00
Juergen Hoeller ca9634143c Upgrade to Reactor 2023.0.0 
Includes Protobuf 3.25.0, Artemis 2.31.2, Checkstyle 10.12.5

Closes gh-31557
 2023-11-15 14:06:43 +01:00
Juergen Hoeller 0e6bf098cb Merge branch '6.0.x' 
# Conflicts:
#	build.gradle
#	framework-platform/framework-platform.gradle
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
 2023-11-15 13:36:03 +01:00
Juergen Hoeller eb1883bdc4 Upgrade to Reactor 2022.0.13 and Netty 4.1.101 
Includes RxJava 3.1.8, Apache HttpComponents Core Reactive 5.2.3, POI 5.2.4, Commons IO 2.15, WebJars Locator 0.55, OpenPDF 1.3.33, JRuby 9.4.5, H2 2.2.224, ActiveMQ 5.17.6, Checkstyle 10.12.5

Closes gh-31585
 2023-11-15 13:29:13 +01:00
Brian Clozel 01f2925048 Upgrade to Micrometer 1.10.13 
Closes gh-31586
 2023-11-13 14:28:45 +01:00
Brian Clozel dced3539a3 Upgrade to Context Propagation 1.1.0 
Closes gh-31599
 2023-11-13 14:15:39 +01:00
Brian Clozel bb66885426 Upgrade to Micrometer 1.12.0 
Closes gh-31556
 2023-11-13 14:15:02 +01:00
Juergen Hoeller 8841b7c3bb Upgrade to SnakeYAML 2.2 2023-11-09 11:52:02 +01:00
Juergen Hoeller 6c00e6162b Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
 2023-11-09 11:50:55 +01:00
Juergen Hoeller 11fdb5ba17 Upgrade to Log4J 2.21.1, Tomcat 10.1.15, Jetty 11.0.18, Undertow 2.3.10, EclipseLink 3.0.4, Mockito 5.7 2023-11-09 10:53:47 +01:00
Sam Brannen cd503e3af6 Upgrade to JUnit 5.10.1 
Closes gh-31558
 2023-11-06 14:57:31 +01:00
Brian Clozel d6c9ed200a Upgrade to EclipseLink 3.0.4 
See gh-31078
 2023-10-26 12:00:03 +02:00
Stéphane Nicoll a5950ca7d5 Polish "Fix spring-orm tests with eclipselink and Java 18+" 
We can't upgrade to Eclipselink 4 as it would change the baseline that
this generation uses. However, there is a recent release in the current
line that adds compatibility with recent JDKs.

See gh-31078
 2023-10-24 16:49:58 +02:00
Dmitrii Bocharov ce778cee27 Fix spring-orm tests with eclipselink and Java 18+ 
See gh-31078
 2023-10-24 16:49:58 +02:00
Brian Clozel 631a5d1dc1 Remove support for Protobuf 2.x and protobuf-java-format 
Closes gh-31465
 2023-10-20 15:05:02 +02:00
Juergen Hoeller 2cdc114273 Merge branch '6.0.x' 2023-10-11 16:11:34 +02:00
Juergen Hoeller 87424cd605 Upgrade to SLF4J 2.0.9 and AspectJ 1.9.20.1 2023-10-11 15:44:07 +02:00
Juergen Hoeller 841448877a Upgrade to Reactor 2023.0.0-RC1 
Includes Jetty 12.0.2 and Checkstyle 10.12.4

Closes gh-31406
 2023-10-11 00:46:24 +02:00
Juergen Hoeller 38de3d5b57 Merge branch '6.0.x' 
# Conflicts:
#	build.gradle
#	framework-platform/framework-platform.gradle
#	spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
 2023-10-11 00:19:54 +02:00
Juergen Hoeller e0a55c2caa Upgrade to Micrometer 1.10.12 and Reactor 2022.0.12 
Includes Context Propagation 1.0.6, Netty 4.1.100, Jetty 11.0.17, Tomcat 10.1.14, Groovy 4.0.15, Mockito 5.6, Checkstyle 10.12.4

Closes gh-31404
Closes gh-31405
 2023-10-11 00:13:51 +02:00
Brian Clozel 99c673f3ea Upgrade to Micrometer 1.12.0-RC1 
Closes gh-31398
 2023-10-10 15:40:32 +02:00
Stephane Nicoll 92b6c5df4f Upgrade to Context Propagation 1.1.0-M4 
Closes gh-31220
 2023-09-13 21:10:46 +02:00
Stephane Nicoll e109c55192 Upgrade to Reactor 2023.0.0-M3 
Closes gh-31219
 2023-09-13 21:10:46 +02:00
Stephane Nicoll 8f21c228b8 Upgrade to Micrometer 1.12.0-M3 
Closes gh-31218
 2023-09-13 21:10:46 +02:00
Stephane Nicoll 50d4a44dfc Upgrade to Context Propagation 1.0.5 
Closes gh-31223
 2023-09-13 18:19:06 +02:00
Stephane Nicoll ebf2cef94e Upgrade to Reactor 2022.0.11 
Closes gh-31222
 2023-09-13 18:17:52 +02:00
Stephane Nicoll c89002a0fb Upgrade to Micrometer 1.10.11 
Closes gh-31221
 2023-09-13 18:16:59 +02:00
Sébastien Deleuze 88ee8fc92f Upgrade to CRaC 1.4.0 
Closes gh-31190
 2023-09-08 17:53:08 +02:00
Arjen Poutsma 6597727c86 Upgrade to Jetty 12 
This commit upgrades Spring Framework to Jetty 12.0.1, and Reactive HTTP
 Client 4.0.0.

Closes gh-30698
 2023-09-04 14:03:29 +02:00
Juergen Hoeller 9b50e7ded6 Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-09-03 01:27:18 +02:00
Juergen Hoeller 278f228688 Upgrade to Groovy 4.0.14, Tomcat 10.1.13, Jetty 11.0.16, Netty 4.1.97, Undertow 2.3.8, Mockito 5.5 2023-09-03 01:25:47 +02:00
Sam Brannen e1826d2322 Reinstate support for @javax.annotation.ManagedBean & @javax.inject.Named 
This commit reinstates support for the legacy JSR-250
@javax.annotation.ManagedBean and JSR-330 @javax.inject.Named
annotations with regard to component name lookups and component
scanning.

Closes gh-31090
 2023-08-26 17:16:00 +02:00
Sébastien Deleuze c564f27647 Upgrade to Kotlin Coroutines 1.7.3 
Closes gh-31108
 2023-08-24 09:17:22 +02:00
Sébastien Deleuze cf0a48692c Upgrade to Kotlin Serialization 1.6.0 
Closes gh-31107
 2023-08-24 09:17:22 +02:00
Juergen Hoeller 4bfbf7d3c8 Merge branch '6.0.x' 2023-08-16 17:56:18 +02:00
Juergen Hoeller 2111bf9b9d Upgrade to Caffeine 3.1.8 and Apache HttpComponents Core Reactive 5.2.2 2023-08-16 17:53:02 +02:00
Juergen Hoeller 3f79b267b1 Merge branch '6.0.x' 2023-08-16 16:55:01 +02:00
Juergen Hoeller 5458e0dccc Upgrade to Tomcat 10.1.12 and AspectJ 1.9.20 2023-08-16 16:52:45 +02:00
Brian Clozel 17109b2402 Upgrade to Reactor 2023.0.0-M2 
Closes gh-31014
 2023-08-16 13:02:05 +02:00
Brian Clozel dbfece6c31 Upgrade to Micrometer 1.12.0-M2 
Closes gh-30997
 2023-08-16 13:01:54 +02:00
Brian Clozel 2c895974b2 Add observability support for JMS 
This commit adds observability support for Jakarta JMS support in
spring-jms support. This feature leverages the `JmsInstrumentation`
infrastructure in `io.micrometer:micrometer-core` library.

This instruments the `JmsTemplate` and the `@JmsListener` support to
record observations:

* "jms.message.publish" when the `JmsTemplate` sends a message
* "jms.message.process" when a message is processed by a `@JmsListener`
  annotated method

The observation `Convention` and `Context` implementations are shipped
with "micrometer-core".

Closes gh-30335
 2023-08-13 18:24:51 +02:00
Sam Brannen dcec61ab7a Remove obsolete dependency on picocli 
The dependency on picocli was removed from the code in commit 019785a72e.

This commit removes the dependency management from the build.

See gh-28825
 2023-08-02 09:54:32 +03:00
Juergen Hoeller 7adacd5ce5 Upgrade to Netty 4.1.96 2023-08-02 01:34:18 +02:00
Sam Brannen 51aaaae94e Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-08-02 09:56:47 +03:00
Juergen Hoeller 10610a6f54 Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-08-02 01:42:27 +02:00
Sam Brannen af1c06917d Upgrade to JUnit 5.10 
Closes gh-30970
 2023-08-01 10:28:50 +03:00
Juergen Hoeller 5e4ed68fdd Merge branch '6.0.x' 
# Conflicts:
#	framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc
 2023-07-26 14:16:43 +02:00
Juergen Hoeller 6fd40a8f60 Upgrade to Caffeine 3.1.7 and H2 2.2.220 2023-07-26 14:15:58 +02:00
Juergen Hoeller b53034fe62 Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-07-22 00:33:12 +02:00
Juergen Hoeller 87d4afda81 Upgrade to Netty 4.1.95 2023-07-22 00:31:19 +02:00
Brian Clozel cc7f3101b7 Upgrade to Context Propagation 1.1.0-M3 
Closes gh-30882
 2023-07-13 11:21:30 +02:00
Brian Clozel a2da97bc4c Upgrade to Micrometer 1.12.0-M1 
Closes gh-30872
 2023-07-12 09:17:09 +02:00
Brian Clozel 2e809903ec Upgrade to Reactor 2023.0.0-M1 
Closes gh-30856
 2023-07-12 08:56:28 +02:00
Brian Clozel 768fc7e341 Upgrade to Reactor 2022.0.9 
Closes gh-30871
 2023-07-12 08:41:46 +02:00
Sam Brannen dc4fcef884 Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-07-11 11:08:59 +02:00
Sam Brannen df50c8db3e Upgrade to micrometer-bom 1.10.9 and context-propagation 1.0.4 
Closes gh-30860
 2023-07-11 10:58:11 +02:00
Juergen Hoeller 2365581265 Upgrade to HSQLDB 2.7.2 and WebJars Locator 0.53 2023-07-04 21:35:37 +02:00
Juergen Hoeller 1e403d1606 Upgrade to Groovy 4.0.13 and Checkstyle 10.12.1 2023-06-30 12:58:28 +02:00
Brian Clozel 5cb6454824 Switch to Reactor 2023.0.0-SNAPSHOT 
See gh-30856
 2023-07-10 18:13:40 +02:00
Sébastien Deleuze 029a69f5c1 Upgrade to Kotlin Coroutines 1.7.2 
Closes gh-30833
 2023-07-07 11:44:03 +02:00
Juergen Hoeller 1777e7f3b7 Merge branch '6.0.x' 
# Conflicts:
#	spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
#	spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
 2023-07-04 21:40:11 +02:00
Sébastien Deleuze 2a126faae7 Upgrade to Project CRaC 1.3.0 
Closes gh-30812
 2023-07-04 17:49:00 +02:00
Juergen Hoeller 83ec9f4fe7 Merge branch '6.0.x' 
# Conflicts:
#	build.gradle
 2023-06-30 13:00:04 +02:00
Juergen Hoeller a6566bfd5f Merge branch '6.0.x' 2023-06-21 18:53:15 +02:00
Juergen Hoeller 8eb0a0b94e Upgrade to Tomcat 10.1.10, Netty 4.1.94, Mockito 5.4 2023-06-21 18:52:02 +02:00
Sam Brannen 6535614d78 Merge branch '6.0.x' 2023-06-21 14:22:11 +02:00
Sam Brannen 2fd83aa764 Polish InitDestroyAnnotationBeanPostProcessor internals, etc. 2023-06-21 14:19:00 +02:00
Juergen Hoeller b20a71a0d3 Merge branch '6.0.x' 
# Conflicts:
#	spring-core/src/main/java/org/springframework/util/ObjectUtils.java
 2023-06-14 11:19:56 +02:00
Juergen Hoeller 13c32d80ba Upgrade to Undertow 2.3.7 and JRuby 9.4.3 2023-06-14 11:18:37 +02:00
Juergen Hoeller bbf3c6ecac Upgrade to Jackson 2.15 
Closes gh-30665
 2023-06-14 10:39:11 +02:00
Juergen Hoeller 858ea1a8c5 Merge branch '6.0.x' 2023-06-14 09:32:30 +02:00
Juergen Hoeller 1df5e9f30c Upgrade to Reactor 2022.0.8 
Closes gh-30655
 2023-06-14 09:31:02 +02:00
Sam Brannen a268203832 Merge branch '6.0.x' 2023-06-13 16:27:20 +02:00
Sam Brannen 6cfb11a360 Upgrade to Micrometer BOM 1.10.8 and context-propagation 1.0.3 
Cloes gh-30657
 2023-06-13 16:21:26 +02:00
Juergen Hoeller 837327f530 Merge branch '6.0.x' 
# Conflicts:
#	build.gradle
 2023-06-04 18:43:46 +02:00
Juergen Hoeller 4be813bbee Upgrade to Groovy 4.0.12, Tomcat 10.1.9, Netty 4.1.93, Undertow 2.3.6, Protobuf 3.23.2, Picocli 4.7.4, Checkstyle 10.12 2023-06-04 18:42:21 +02:00
Sam Brannen f4f8066877 Merge branch '6.0.x' 2023-05-23 11:36:40 +02:00
Sam Brannen a8b400803b Upgrade to TestNG 7.8.0 2023-05-23 11:36:25 +02:00
Sébastien Deleuze c3e28728ce Upgrade to Kotlin Serialization 1.5 
Closes gh-30515
 2023-05-22 18:07:32 +02:00
Sébastien Deleuze f956d399ae Upgrade to Kotlin Coroutines 1.7 
Leverages Kotlin/kotlinx.coroutines#3487.

Closes gh-30514
 2023-05-22 18:07:21 +02:00
Andrey Somov 097758baf3 Upgrade to SnakeYAML 2.0 
This commit raises the SnakeYAML baseline version to 2.0.
While most Spring applications are not affected by CVE-2022-1471,
upgrading this version should prevent automated tools from raising this
as a security issue. Such tools usually do not understand that YAML
parsing in Spring is about reading configuration, not parsing untrusted
content.

Closes gh-30048
 2023-05-22 14:31:27 +02:00
rstoyanchev bc7ba8cf2b Merge branch '6.0.x' 
Closes gh-30435
 2023-05-09 12:16:13 +01:00
Juergen Hoeller 6930d4d531 Upgrade to Reactor 2022.0.7 and Micrometer 1.10.7 
Includes Protobuf 3.23, Woodstox 6.5.1, Caffeine 3.1.6, Picocli 4.7.3, BlockHound 1.0.8, ActiveMQ 5.17.4

Closes gh-30450
Closes gh-30451
 2023-05-09 12:55:44 +02:00
Juergen Hoeller 657fe1fa43 Merge branch '6.0.x' 2023-05-08 14:52:26 +02:00
Juergen Hoeller 4aa8619ac2 Upgrade to Tomcat 10.1.8, Jetty 11.0.15 / 12.0.0.beta1, Netty 4.1.92, Jackson 2.14.3, Mockito 5.3.1, Checkstyle 10.10 2023-05-08 13:06:19 +02:00
Juergen Hoeller 8d604350e4 Support for Project CRaC in DefaultLifecycleProcessor 
Includes stopForRestart/restartAfterStop functionality.

Closes gh-30242
 2023-05-03 16:01:41 +02:00
Juergen Hoeller 6a2262969e Upgrade to Tomcat 10.1.8, Jetty 11.0.15, Netty 4.1.92, Mockito 5.3.1 2023-04-30 23:08:28 +02:00
Sam Brannen 230840a41c Upgrade to JUnit 5.9.3 2023-04-26 10:26:56 +02:00
Stephane Nicoll 90627b4345 Upgrade to Micrometer 1.10.6 
Closes gh-30317
 2023-04-12 14:45:54 +02:00
Juergen Hoeller 4acc71b282 Upgrade to Reactor 2022.0.6 and Netty 4.1.91 
Includes Checkstyle 10.9.3 and Mockito 5.3.0

Closes gh-30316
 2023-04-12 13:36:01 +02:00
Sam Brannen ca545ac3d4 Upgrade dependencies 2023-04-02 19:20:49 +02:00
Juergen Hoeller a0358a4650 Upgrade to Reactor 2022.0.5 and Netty 4.1.90 
Includes Checkstyle 10.9.1 and Mockito 5.2.0

Closes gh-30133
 2023-03-17 17:36:51 +01:00