5a08ca0b45
Merge branch '1.2.x'
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-deployment-tests/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-atmosphere/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hateoas/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jersey/pom.xml
spring-boot-samples/spring-boot-sample-jersey1/pom.xml
spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml
spring-boot-samples/spring-boot-sample-jetty8/pom.xml
spring-boot-samples/spring-boot-sample-jpa/pom.xml
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/build.gradle
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-testng/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml
spring-boot-samples/spring-boot-sample-undertow/pom.xml
spring-boot-samples/spring-boot-sample-velocity/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-mustache/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hateoas/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jersey/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml
spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-log4j2/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mail/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-mustache/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-undertow/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-configuration-processor/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
10 years ago
42e69359a8
Fixup version numbers following release
10 years ago
e03c11dda8
Next development version
10 years ago
cddf54e576
Revert "Upgrade to H2 1.4.186"
...
This reverts commit 3a22443fbb
10 years ago
346392d31b
Introduce a validation starter
...
Previously, the only starter that provided validation was
spring-boot-starter-web which included Hibernate Validator and
Tomcat's EL implementation. This left users writing non-web
applications to figure out the dependencies for themselves. They would
sometimes run into difficulties as Hibernate Validator's need for an
EL implementation would trip them up.
This commit adds a new starter, spring-boot-starter-validation,
which provides both Hibernate Validator and Tomcat's EL
implementation. spring-boot-starter-web has been updated to depend on
this starter rather than depending on Hibernate Validator directly.
Closes gh-2678
10 years ago
fd22b57846
Add dependency management for Postgresql
...
Closes gh-2545
10 years ago
85319c0793
Fix Java 8 Javadoc errors
10 years ago
48959f2553
Add support for EhCache
...
Include auto-configuration support for EhCache with auto-detection of
the default `ehcache.xml` at the root of the classpath. EhCache
configuration can also be set via `spring.cache.config`.
See gh-2633
10 years ago
151220f41d
Add cache manager auto-configuration
...
Add support for cache manager auto-configuration that is triggered when
the `EnableCaching` annotation is added to a Spring Boot application.
A new "spring.cache" set of configuration keys is also provided. The
"spring.cache.mode" allows the user to specify the cache provider that
should be auto-configured. If no explicit configuration is provided,
the environment is checked for the best suited cache implementation,
that is:
- Generic if at least one `Cache` bean is defined in the context.
- Hazelcast if either a default configuration file is present or the
`spring.cache.config` property is set.
- JCache if one JSR-107 provider is present
- Redis if a `RedisTemplate` is defined in the context
- Guava
- Simple as a fallback option, using concurrent maps
- NoOp (that is, no cache) if the mode is set to "none"
If the provider supports it, it is possible to specify the caches
to create on startup via `spring.cache.cache-names`. If the provider
relies on a configuration file and a custom one needs to be used
`spring.cache.config` can be set to such custom resource.
If more than one JSR-107 provider is present, it is possible to force
the provider to use by setting the mode to `jcache` and specifying the
fully qualified class name of the CachingProvider to use via
`spring.cache.jcache.provider`.
See gh-2633
10 years ago
99fde7ac89
Merge branch '1.2.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
2cf23e08a0
Upgrade to Undertow 1.1.3.Final
...
Closes gh-2732
10 years ago
3a22443fbb
Upgrade to H2 1.4.186
...
Closes gh-2730
10 years ago
17f03641de
Upgrade to Dropwizard Metrics 3.1.1
...
Closes gh-2731
10 years ago
5963760c9c
Merge branch '1.2.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
9285c9fd77
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
fe837c0cea
Upgrade to Reactor 1.1.6.RELEASE
...
gh-2735
10 years ago
de28ed4aa1
Upgrade to Groovy 2.3.11
...
Closes gh-2733
10 years ago
adbd340c91
Upgrade to Logback 1.1.3
...
Closes gh-2729
10 years ago
887a7cce1e
Upgrade to SLF4J 1.7.11
...
Closes gh-2734
10 years ago
0c8b2889fb
Merge branch '1.2.x'
10 years ago
d428afb45f
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
936e1c2152
Update to Spring Security 3.2.7.RELEASE
...
Closes gh-2726
10 years ago
1307a2401d
Upgrade Spring WS in 1.1.x as well
...
See gh-2718
10 years ago
a6028280d2
Polishing
10 years ago
a67a37840b
Merge branch '1.2.x'
10 years ago
599792097c
Upgrade Spring WS to 2.2.1.RELEASE
...
Closes gh-2718
10 years ago
c9997f7a4d
Upgrade to Spring Framework 4.1.6
...
Closes gh-2702
10 years ago
04c5fc8856
Start building against Spring Framework 4.2.0 snapshots
...
See gh-2575
10 years ago
cebd58ad23
Merge branch '1.2.x'
10 years ago
6322ea142d
Upgrade to Spring Framework 4.1.6.BUILD-SNAPSHOT
...
See gh-2702
10 years ago
2c3c62d71c
Replace basic Gradle dependency management with use of separate plugin
...
This commit replaces Spring Boot's basic dependency management support
with separate dependency management plugin. This has a number of
benefits including:
1. A Maven bom can be used rather than a custom properties file
2. Dependency management is applied transitively rather than only to
direct dependencies
3. Exclusions are applied as they would be in Maven
4. Gradle-generated poms are automatically configured with the
appropriate dependency management
Closes gh-2133
10 years ago
0e47a70f9e
Upgrade to Groovy 2.4.1
...
Closes gh-2681
10 years ago
055d841eb3
Upgrade to Flyway 3.2
...
Closes gh-2675
10 years ago
99de71bf65
Upgrade to Jackson 2.5.1
...
Closes gh-2332
10 years ago
81d25a5705
Upgrade to Spring Data Fowler RC1
10 years ago
1fba81e4ba
Upgrade Spring Security 3.2.6.RELEASE
...
Closes gh-2582
10 years ago
2f791602a0
Upgrade to ActiveMQ 5.11.1
...
Closes gh-2662
10 years ago
f05769dcc5
Add auto-configuration for SendGrid's client
...
Closes gh-2160
Closes gh-2280
10 years ago
33a92caad6
Provide dependency management for logback-access
...
Closes gh-2550
10 years ago
c4145106e8
Provide dependency management for MariaDB Java client
...
Closes gh-2448
10 years ago
22e5f86f37
Upgrade to maven-dependency-plugin 2.10
...
See gh-2430
10 years ago
993f3a078d
Upgrade to Joda-Time 2.7
...
Closes gh-2153
10 years ago
3fbb7c91c1
Merge branch '1.2.x'
10 years ago
9f0654bd77
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
44d98c6186
Upgrade to Freemarker 2.3.22
...
Closes gh-2581
10 years ago
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
10 years ago
8ce39bda88
Fixup version numbers following release
10 years ago
8f0ad02237
Next development version
10 years ago
8a49218e82
Fixup version numbers following release
10 years ago
aea68f0c32
Next development version
10 years ago
10caace55f
Upgrade to Spring Security 3.2.6
...
Closes gh-2539
10 years ago
f43f2fb8c4
Upgrade to Jetty 9.2.9
...
Closes gh-2554
10 years ago
affa584916
Upgrade to Tomcat 8.0.20
...
Fixes gh-2547
10 years ago
236f51a841
Upgrade Spring Security to 3.2.6.CI-SNAPSHOT
...
See gh-2539
10 years ago
10257d96f2
Merge branch '1.1.x'
10 years ago
7ac8cac3b5
Reorganize integration tests
...
Make spring-boot-integration-tests a top level project and move the
existing gradle tests and security tests to be sub-modules.
10 years ago
31639be94b
Add dependency management for Apache Derby
10 years ago
1d69a71b75
Upgrade to Spring 4.1.5
...
Closes gh-2413
10 years ago
ecdc6a06a1
Merge branch '1.1.x'
...
Fixes gh-2212
10 years ago
b29c5a3297
Upgrade to Groovy 2.3.10
...
Closes gh-2429
10 years ago
9af30450c4
Upgrade to Liquibase 3.3.2
...
Closes gh-2512
10 years ago
6028f6b343
Upgrade to Jetty 9.2.7
...
Closes gh-2511
10 years ago
4178613d72
Upgrade to ActiveMQ 5.10.1
...
Closes gh-2510
10 years ago
119e37a1f9
Upgrade to JMustache 1.10
...
Closes gh-2508
10 years ago
375a08d7ce
Upgrade to H2 1.4.185
...
Closes gh-2507
10 years ago
ce303f9f59
Upgrade to Jackson 2.4.5
...
Closes gh-2506
10 years ago
d87bf707a7
Merge branch '1.1.x'
10 years ago
11e0444814
Upgrade to Spring Security JWT 1.0.3.RELEASE
...
Closes gh-2304
10 years ago
99a0661565
Upgrade to Spring Batch 3.0.3.RELEASE
...
Closes gh-2503
10 years ago
4840417cd9
Upgrade to mongo-java-driver 2.12.5
...
Closes gh-2502
10 years ago
3b8c9418b1
Upgrade to JDom 2.0.6
...
Closes gh-2501
10 years ago
8c534547c9
Upgrade to Groovy 2.3.9
...
Closes gh-2500
10 years ago
cdc2008146
Upgrade to AspectJ 1.8.5
...
Closes gh-2499
10 years ago
3f285d1bf0
Upgrade to Tomcat 7.0.59
...
Closes gh-2498
10 years ago
6a93fa1dd0
Upgrade to Jackson 2.3.5
...
Closes gh-2497
10 years ago
b40f689e1d
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
10 years ago
6aaa5ee933
Upgrade to CRaSH 1.3.1
...
Closes gh-2425
10 years ago
e5d653dbd4
Update to Spring AMQP 1.4.3.RELEASE
...
Closes gh-2452
10 years ago
9212574191
Upgrade to Spring AMQP 1.3.9.RELEASE
...
Closes gh-2453
10 years ago
68c7c65d52
Configure SnakeYAML so the timestamp-like strings do not become Dates
...
By default, SnakeYAML will convert a timestamp-like string into a
java.util.Date. This differs to properties file-based configuration
where the values are always strings. Dates are problematic as the
round trip (string -> Date -> string) can change the value. For example,
“2015-01-27” becomes “Tue Jan 27 00:00:00 GMT 2015”.
This commit updates YamlPropertySourceLoader to use a Yaml with a
custom Resolver subclass that suppresses the addition of the implicit
resolver for timestamps. Supressing the addition of the unwanted
resolver, rather than overriding addImplicitResolvers and registering
the resolvers that we do want, ensures that we get all of the other
default Resolvers in their default order.
Fixes gh-2422
10 years ago
c60fab92ce
Upgrade to Spring Data Evans SR2
...
Closes gh-2424
10 years ago
b2a059a385
Upgrade to Spring Data Dijkstra SR5
...
Closes gh-2423
10 years ago
37ffa6dc85
Upgrade to Tomcat 8.0.18
...
Closes gh-2415
See gh-1920
10 years ago
01344c8617
Add a starter for building a RESTful service with Spring HATEOAS
...
Closes gh-2396
10 years ago
ea7b5c6e3c
Improve support for alternative Log4j 2 configuration file formats
...
This commit adds support for configuring Log4j 2 with YAML. It also
improves the existing support for configuring Log4j 2 with JSON.
Previously, Log4J2LoggingSystem returned a hard-coded list of standard
config locations that includes both JSON and XML file suffixes. Log4j
2’s support for JSON configuration files requires Jackson’s ObjectMapper
to be on the classpath so, in its absence, the standard config locations
were incorrect.
This commit updates Log4J2LoggingSystem to return an array of standard
config locations based on what’s on the classpath. It also updates the
documentation to describe the additional dependencies that are required
to enable YAML or JSON-based configuration.
Closes gh-2239
10 years ago
0025be8771
Upgrade to Flyway 3.1
...
The 3.1 release includes an important fix to restore JDK 6
compatibility with the Gradle plugin [1].
Closes gh-2260
[1] https://github.com/flyway/flyway/issues/779
10 years ago
6975b206bc
Upgrade Spring Cloud Connectors to 1.1.1.RELEASE
...
Closes gh-2373
10 years ago
69ea4beb8a
Add auto-configuration for Jetty’s GzipFilter
...
Jetty’s GzipFilter is a container-agnostic Filter that can be used to
provide gzip and deflate encoding of HTTP responses. This commit adds
auto-configuration for GzipFilter that is enabled when
org.eclipse.jetty:jetty-servlets is on the classpath. The filter can
be configured using spring.http.gzip.*
See gh-2031
10 years ago
492cf4ef54
Add jersey-bean-validation to spring-boot-starter-jersey
...
A dependency on org.glassfish.jersey.ext:jersey-bean-validation has
been added to spring-boot-starter-jersey. jersey-bean-validation’s EL
dependencies have been excluded in favour of those provided by
spring-boot-starter-tomcat (or starter-jetty or starter-undertow should
the user choose to use a different embedded container).
Closes gh-2315
10 years ago
c0ef7d1815
Upgrade to Spring AMQP 1.4.2.RELEASE
10 years ago
b97fc63234
Upgrade to Spring Integration 4.1.2.RELEASE
...
Closes gh-2352
10 years ago
dcc07ad6c9
Upgrade to Mockito 1.10.19
...
Closes gh-2337
10 years ago
1ab510e53c
Upgrade to H2 1.4.184
...
Closes gh-2334
10 years ago
bb058934a6
Upgrade to Gson 2.3.1
...
Closes gh-2333
10 years ago
de2087ff2e
Merge branch '1.1.x'
10 years ago
92c8b75a73
Upgrade to Spring Integration 4.0.6.RELEASE
...
Closes gh-2358
10 years ago
3ef768e76d
Upgrade to Spring AMQP 1.3.8.RELEASE
...
Closes gh-2357
10 years ago
912060698d
Upgrade to SLF4J 1.7.10
...
Closes gh-2336
10 years ago
ca1716e9d6
Upgrade to Hibernate 4.3.8
...
Closes gh-2335
10 years ago
2729c747ca
Add jmustache support
...
The package names changed a bit from the prototype project, but wuth vanilla
autconfiguration usage that shouldn't matter. Follows closely the Groovy
templates support. Templates live in classpath:/templates/*.html by default.
Fixes gh-2242
10 years ago
Phillip Webb
Spring Buildmaster
Andy Wilkinson
Stephane Nicoll
Eddú Meléndez
Greg Turnquist
Maciej Walkowiak
izeye
Michael Cramer
Drummond
Chris Schaefer
Dave Syer