Go to file

Sam Brannen d20d95b7ac Allow directly present @BootstrapWith to override meta annotations

Prior to this commit, if a test class was meta-annotated with multiple
@BootstrapWith declarations that registered different
TestContextBootstrapper implementations, such a configuration would
result in an IllegalStateException, and there was no way to override
this behavior.

This commit addresses this shortcoming by relaxing the explicit
TestContextBootstrapper resolution in BootstrapUtils so that a directly
present @BootstrapWith annotation will now override declarations of
@BootstrapWith that are meta-present. In other words, if @BootstrapWith
is used as a meta-annotation, it can be overridden directly on the test
class via an explicit, local declaration of @BootstrapWith.

Issue: SPR-17006

2018-08-15 16:17:05 +02:00

buildSrc

Latest dependency updates (POI 3.17, Rome 1.8, EhCache 3.4, Caffeine 2.5.6, RxJava 2.1.4, Tomcat 8.5.21, JRuby 9.1.13, Rhino 1.7.7.2)

2017-09-23 11:28:19 +02:00

gradle

Generate “Use” links in aggregated Spring API JavaDoc

2018-08-13 11:56:18 +02:00

spring-aop

Post-processors ignore AopInfrastructureBean (includes ScopedObject)

2018-08-11 23:10:57 +02:00

spring-aspects

Clean up warnings and delete dead code

2018-08-12 15:55:11 +02:00

spring-beans

Refined warn/info logging in AutowiredAnnotationBeanPostProcessor

2018-08-13 12:43:52 +02:00

spring-context

SpringCacheAnnotationParser.parseCacheAnnotations cannot be protected

2018-08-13 12:43:59 +02:00

spring-context-indexer

Move indexer implementation to index.processor subpackage (for Jigsaw)

2018-07-03 17:55:24 +02:00

spring-context-support

Upgrade to JUnit Jupiter 5.3 RC1 (and Jetty 9.4.12 RC1)

2018-08-14 20:33:30 +02:00

spring-core

Polishing

2018-08-13 14:36:37 +02:00

spring-expression

SPR-17074 pass argument of addAll/putAll into constructor

2018-07-30 21:27:55 +02:00

spring-framework-bom

Remove dependency management noise from POMs

2018-06-11 15:57:54 +02:00

spring-instrument

Use consistent class design

2018-06-28 10:28:44 +02:00

spring-jcl

Differentiate internal LogAdapter from core.log.LogDelegateFactory

2018-07-25 14:14:38 +02:00

spring-jdbc

Polish contribution

2018-08-13 14:40:04 +02:00

spring-jms

Post-processors consistently ignore ScopedObject/AopInfrastructureBean

2018-08-12 11:47:28 +02:00

spring-messaging

Order property for SimpUserRegistry

2018-08-13 11:56:34 +03:00

spring-orm

Clean up warnings and delete dead code

2018-08-12 15:55:11 +02:00

spring-oxm

Clean up warnings and delete dead code

2018-08-12 15:55:11 +02:00

spring-test

Allow directly present @BootstrapWith to override meta annotations

2018-08-15 16:17:05 +02:00

spring-tx

Polishing

2018-08-10 19:23:44 +02:00

spring-web

Consistent logging of resolved exceptions

2018-08-15 10:57:51 +03:00

spring-webflux

Revert "Infer HTTP 404 from empty Optional/Publisher types"

2018-08-15 15:15:35 +02:00

spring-webmvc

Revert "Infer HTTP 404 from empty Optional/Publisher types"

2018-08-15 15:15:35 +02:00

spring-websocket

Order property for SimpUserRegistry

2018-08-13 11:56:34 +03:00

src

Fix merge conflict in reference manual

2018-08-15 15:37:49 +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

build.gradle

Upgrade to JUnit Jupiter 5.3 RC1 (and Jetty 9.4.12 RC1)

2018-08-14 20:33:30 +02:00

CODE_OF_CONDUCT.adoc

Add Code of Conduct

2016-02-01 14:37:35 -06:00

CONTRIBUTING.md

Fix typo

2018-04-24 10:05:43 +02:00

gradle.properties

Next Development Version

2018-04-03 20:11:32 +00:00

gradlew

Upgrade to Gradle 4.1

2017-08-08 17:26:21 +02:00

gradlew.bat

Upgrade build to Gradle 3.0

2016-08-15 21:26:39 +02:00

import-into-eclipse.md

Update eclipse setting and instructions

2018-06-25 17:56:53 -07:00

import-into-idea.md

Polish

2017-05-29 17:04:10 +02:00

README.md

Update README.md

2017-11-28 09:28:34 -05:00

settings.gradle

Cleanup settings.gradle pluginManagement configuration

2018-04-04 11:08:13 +02:00

README.md

Spring Framework

This is the home of the Spring Framework, the foundation for all Spring projects. Together the Spring Framework and the family of Spring projects make up what we call "Spring".

Spring provides everything you need beyond the Java language to create enterprise applications in a wide range of scenarios and architectures. Please read the Overview section in the 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. 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 Frameworks 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 also CONTRIBUTING.md.

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.