Go to file
Sam Brannen 9cb15ba602 Merge class-level and method-level @Sql declarations
Prior to these commits method-level @Sql declarations always overrode
class-level @Sql declarations, which required developers to redeclare
class-level @Sql declarations on test methods (e.g., via
copy-and-paste) in order to combine them with method-level @Sql
declarations.

These commits provide developers the ability to optionally merge
class-level and method-level @Sql declarations via a new @SqlMergeMode
annotation that can be applied at the class level or method level, with
method-level declarations of @SqlMergeMode overriding class-level
declarations. For example, @SqlMergeMode(MERGE) switches from the
default OVERRIDE behavior to merging behavior, with class-level SQL
scripts and statements executed before method-level SQL scripts and
statements.

Closes gh-1835
2019-07-21 16:20:29 +02:00
.github Add "Affects" field to issue template 2019-01-18 15:27:43 -05:00
buildSrc Polish URL Cleanup 2019-03-22 00:24:06 -05:00
gradle Upgrade to Gradle 5.5.1 2019-07-11 14:11:36 +02:00
spring-aop Avoid unnecessary boxing where primitives can be used 2019-07-10 16:51:18 +02:00
spring-aspects Consistent early eviction tests in regular and transactional scenarios 2019-07-20 15:05:07 +02:00
spring-beans Merge branch '5.1.x' 2019-07-20 16:35:05 +02:00
spring-context Merge branch '5.1.x' 2019-07-20 18:23:00 +02:00
spring-context-indexer Remove use of @Nullable from copy of SortedProperties 2019-06-12 15:31:54 +03:00
spring-context-support Consistent early eviction tests in regular and transactional scenarios 2019-07-20 15:05:07 +02:00
spring-core Upgrade to Coroutines 1.3.0-RC 2019-07-21 11:27:43 +02:00
spring-core-coroutines Upgrade to Coroutines 1.3.0-RC 2019-07-21 11:27:43 +02:00
spring-expression Merge branch '5.1.x' 2019-07-05 18:22:02 +02:00
spring-framework-bom Remove dependency management noise from POMs 2018-06-11 15:57:54 +02:00
spring-instrument URL Cleanup 2019-03-21 23:49:28 -05:00
spring-jcl URL Cleanup 2019-03-21 23:49:28 -05:00
spring-jdbc Use Kotlin BOM 2019-07-19 10:43:54 +02:00
spring-jms Merge branch '5.1.x' 2019-06-12 18:16:30 +02:00
spring-messaging Upgrade to Coroutines 1.3.0-RC 2019-07-21 11:27:43 +02:00
spring-orm Merge branch '5.1.x' 2019-07-17 23:35:48 +02:00
spring-oxm Upgrade to Protobuf 3.9 (plus consistent XMLUnit declarations) 2019-07-20 19:06:54 +02:00
spring-test Introduce @SqlMergeMode for configuring @Sql annotation merging 2019-07-21 14:34:35 +02:00
spring-tx Introduce TransactionOperations.execute(Runnable) convenience method 2019-07-17 22:35:26 +02:00
spring-web Suppress deprecation warnings in Gradle build 2019-07-21 13:12:02 +02:00
spring-webflux Suppress deprecation warnings in Gradle build 2019-07-21 13:12:02 +02:00
spring-webmvc Merge branch '5.1.x' 2019-07-20 18:23:00 +02:00
spring-websocket Delete dead code in tests 2019-07-18 12:20:26 +02:00
src Document @SqlMergeMode support in reference manual 2019-07-21 15:37:51 +02:00
.editorconfig Add EditorConfig 2017-06-12 08:07:54 +02:00
.gitignore Reorganize spring-web-reactive .gitignore 2016-07-18 17:31:18 +02:00
.mailmap Change gopivotal.com to pivotal.io 2014-10-05 18:12:50 +02:00
CODE_OF_CONDUCT.adoc URL Cleanup 2019-03-21 15:08:55 -05:00
CONTRIBUTING.md Fix typo in CONTRIBUTING.md 2019-06-22 22:34:05 +03:00
README.md Wikipedia -> Wiki 2019-03-23 13:44:59 +01:00
SECURITY.md Create SECURITY.md 2019-05-23 11:36:52 -04:00
build.gradle Upgrade to Coroutines 1.3.0-RC 2019-07-21 11:27:43 +02:00
gradle.properties Next Development Version 2019-06-13 14:04:56 +00:00
gradlew Upgrade to Gradle 5.5 2019-06-29 11:54:19 +03:00
gradlew.bat Upgrade to Gradle 5.5 2019-06-29 11:54:19 +03:00
import-into-eclipse.md URL Cleanup 2019-03-21 15:08:55 -05:00
import-into-idea.md URL Cleanup 2019-03-21 15:08:55 -05:00
settings.gradle Introduce spring-core-coroutines module 2019-03-25 21:57:53 +01:00

README.md

Spring Framework

This is the home of the Spring Framework: the foundation for all Spring projects. Collectively the Spring Framework and the family of Spring projects is often referred to simply as "Spring".

Spring provides everything required beyond the Java programming language for creating enterprise applications for a wide range of scenarios and architectures. Please read the Overview section as reference for a more complete introduction.

Code of Conduct

This project is governed by the Spring Code of Conduct. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.

Access to Binaries

For access to artifacts or a distribution zip, see the Spring Framework Artifacts wiki page.

Documentation

The Spring Framework maintains reference documentation (published and source), Github wiki pages, and an API reference. There are also guides and tutorials across Spring projects.

Build from Source

See the Build from Source Wiki page and the CONTRIBUTING.md file.

Stay in Touch

Follow @SpringCentral, @SpringFramework, and its team members on Twitter. In-depth articles can be found at The Spring Blog, and releases are announced via our news feed.

License

The Spring Framework is released under version 2.0 of the Apache License.