8242897c81
Merge branch '5.3.x'
2022-07-13 16:13:49 +02:00
c6be3b33c9
Fix and improve Javadoc in spring-aop
...
Closes gh-28803
2022-07-13 16:13:02 +02:00
ee209de9cf
Merge branch '5.3.x'
...
# Conflicts:
# spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
# spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
# spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
# spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
# spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
2022-05-31 14:15:36 +02:00
1beb7068f6
Use new AssertJ exception assertions
2022-05-31 14:08:28 +02:00
f0125afb5e
Remove references to JCacheConfigurerSupport and CachingConfigurerSupport
...
See gh-27863
2021-12-29 10:53:56 +01:00
b6faaf1fc1
Merge branch '5.3.x'
2021-12-15 10:59:50 +01:00
c7642422c3
Stop resolving CachingConfigurer instances eagerly
...
Closes gh-27751
2021-12-15 10:52:09 +01:00
2f32806bcb
Update aspectj-plugin to 6.3.0
...
Version 6.3.0 aligns with the used Gradle 7.3
Closes gh-27678
2021-11-25 22:19:43 +01:00
b88ed7f4bb
Update API version and package references for Jakarta EE 9
...
Closes gh-27689
See gh-25354
2021-11-17 12:39:23 +01:00
87cb84b832
Merge branch '5.3.x'
2021-10-12 12:27:55 +02:00
5bd90538b3
Introduce test for gh-27499 and polish contribution
2021-10-12 12:22:24 +02:00
fa3a2dc981
Upgrade to AspectJ 1.9.8 RC1 for Java 17 support
...
See gh-27537
2021-10-08 19:33:30 +02:00
16bf39ea1b
Merge branch '5.3.x'
2021-09-28 10:35:18 +02:00
2567b20949
Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41
...
In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.
The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.
In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.
In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.
This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.
Closes gh-27481
2021-09-28 10:29:31 +02:00
d84ca2ba90
Jakarta EE 9 migration
...
Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).
Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
2021-09-17 09:14:07 +02:00
4e3d1fa4e9
Temporarily downgrade Java compat level for AspectJ classes
...
AspectJ doesn't support JDK17 language level (yet).
For the time being, this commit is downgrading the language level for
the aspectJ generated classes to 1.8.
See gh-27416
2021-09-15 16:20:48 +02:00
cecc0849a8
Upgrade to Gradle 7.2
...
This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.
See gh-26870
2021-09-13 09:37:35 +02:00
238354a081
Polishing
2020-11-16 17:42:22 +01:00
e02d3f32b4
Requalify tests as LONG_RUNNING
...
Prior to this commit, some tests would belong to the PERFORMANCE
`TestGroup`, while they were not testing for performance but rather
performing functional tests that involve long running operations or
timeouts.
This commit moves those tests to the LONG_RUNNING `TestGroup`.
See gh-24830
2020-09-25 13:43:38 +02:00
ae5913f3b6
Polish tests
...
See gh-25456
2020-07-22 11:09:52 +02:00
cd12583e13
Use Integer.parseInt instead of Integer.valueOf for primitive int
...
Closes gh-25456
2020-07-22 10:54:32 +02:00
97efacc9a4
Merge branch '5.2.x'
...
# Conflicts:
# spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
2020-06-23 12:01:24 +02:00
9e12a20324
Polishing
2020-06-23 11:35:22 +02:00
b67de25d67
add @Override in class AnnotationBeanConfigurerAspect
2020-06-23 10:29:03 +02:00
f09093132e
Use proxyBeanMethods=false on remaining internal configuration classes
...
Closes gh-24511
2020-05-12 22:19:44 +02:00
9036cc6899
Remove unnecessary dependency on spring-orm
...
Prior to this commit, spring-aspects would consider spring-orm as a
module providing aspects, which is not the case (anymore).
This commit removes that dependency as a result.
Fixes gh-24491
2020-02-17 20:54:58 +01:00
d1c7083e77
Consistent ROLE_INFRASTRUCTURE declarations for configuration classes
...
Closes gh-24509
2020-02-12 16:49:02 +01:00
5581f3b77b
Use Gradle test fixture support for spring-tx
...
See gh-23550
2020-01-02 16:01:35 +01:00
726b1bb1d0
Rename test fixture package in spring-context
...
See gh-23550
2020-01-02 16:01:35 +01:00
4260c34b47
Rename test fixture package in spring-core
...
See gh-23550
2020-01-02 16:01:34 +01:00
0335db23c9
Use Gradle test fixture support for spring-context-support
...
See gh-23550
2020-01-02 16:01:34 +01:00
61d4ee594d
Use Gradle test fixture support for spring-beans and spring-context
...
See gh-23550
2020-01-02 16:01:34 +01:00
5718bf424b
Use Gradle test fixture support for spring-core
...
See gh-23550
2020-01-02 16:01:34 +01:00
bd70f10d2b
Merge branch '5.1.x'
...
# Conflicts:
# build.gradle
# spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
# spring-aspects/spring-aspects.gradle
# spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
# spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
# spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
# spring-orm/spring-orm.gradle
# spring-test/spring-test.gradle
2019-09-25 12:43:24 +02:00
b1ed0511f7
Upgrade to Tomcat 9.0.26, Undertow 2.0.26, Hibernate ORM 5.3.12
...
Includes Netty 4.1.39 (aligned with Reactor) and Checkstyle 8.24.
2019-09-25 12:15:02 +02:00
d945ae9191
Add blank line between java and javax imports
...
See gh-23539
Co-authored-by: Sam Brannen <sbrannen@pivotal.io>
2019-09-16 13:41:59 +02:00
deba2ed1b3
Add blank line between java and javax imports
...
See gh-23539
2019-09-04 22:05:46 -07:00
d4089747b8
Use dependency management in Framework build
...
Prior to this commit, the Spring Framework build would partially use the
dependency management plugin to import and enforce BOMs.
This commit applies the dependency management plugin to all Java
projects and regroups all version management declaration in the root
`build.gradle` file (versions and exclusions).
Some versions are overridden in specific modules for
backwards-compatibility reasons or extended support.
This commit also adds the Gradle versions plugin that checks for
dependency upgrades in artifact repositories and produces a report; you
can use the following:
./gradlew dependencyUpdates
2019-09-02 18:01:09 +02:00
dda047623d
Fix "missing aspectjrt.jar" warnings in spring-aspects
...
See gh-23506
2019-08-23 17:05:31 +02:00
50decc43ce
Fix aspectj dependency in spring-aspects
...
See gh-23506
2019-08-23 14:47:39 +02:00
a07ce8eb82
Polishing
2019-08-23 13:50:57 +02:00
fbee3ed889
Use the 'io.freefair.aspectj' Gradle plugin
...
See gh-23282
See spring-projects/spring-security#7183
Closes gh-23506
2019-08-23 10:57:10 +02:00
3f3e41923f
Migrate rest of test suite from JUnit 4 to JUnit Jupiter
...
This commit migrates the rest of Spring's test suite to JUnit Jupiter,
except spring-test which will be migrated in a separate commit.
See gh-23451
2019-08-17 11:36:58 +02:00
8aa0b07768
Consistent early eviction tests in regular and transactional scenarios
...
See gh-23192
2019-07-20 15:05:07 +02:00
9d74da006c
Migrate JUnit 4 assertions to AssertJ
...
Migrate all existing JUnit 4 `assert...` based assertions to AssertJ
and add a checkstyle rule to ensure they don't return.
See gh-23022
2019-05-23 15:52:49 -07:00
95a9d46a87
Migrate Hamcrest assertions to AssertJ
...
Migrate all existing `assertThat(..., Matcher)` assertions to AssertJ
and add checkstyle rules to ensure they don't return.
See gh-23022
2019-05-23 15:49:59 -07:00
02850f357f
Migrate exception checking tests to use AssertJ
...
Migrate tests that use `@Test(expectedException=...)` or
`try...fail...catch` to use AssertJ's `assertThatException`
instead.
2019-05-20 10:47:53 -07:00
73dbd06361
Enforces static imports for JUnit 4 assertions and assumptions
...
This commit configures Checkstyle to enforces static imports for JUnit 4
assertions and assumptions.
See gh-22932
2019-05-12 15:13:07 +02:00
deecab6311
Use assertThat from Hamcrest instead of JUnit 4
...
org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.
See gh-22894
2019-05-12 14:46:55 +02:00
816bbee8de
Remove '.*' imports from tests
...
Organize test imports to expand all '.*' static imports into
fully qualified imports.
This update will allow us to use additional checkstyle rules in
the future, and will also help if we migrate fully to AssertJ.
2019-05-08 09:55:09 -07:00
Sam Brannen
Marc Wrobel
izeye
Stephane Nicoll
Lars Grefer
Juergen Hoeller
Brian Clozel
XenoAmess
yanghuai9
Juergen Hoeller
Brian Clozel
Sam Brannen
Phillip Webb