b552abaa41
Merge branch '1.5.x'
8 years ago
ba3fae373d
Merge branch '1.4.x' into 1.5.x
8 years ago
e7f13b446a
Minor fix in description
...
Closes gh-7755
8 years ago
9057f9ae1f
Next development version
8 years ago
219e0baa58
Merge branch '1.5.x'
8 years ago
449043bf21
Polish contribution
...
Closes gh-6900
8 years ago
6e02fe59f7
Merge branch '1.5.x'
8 years ago
c700cf28cc
Fix typo in Kafka sample
8 years ago
8b47561f7e
Merge branch '1.5.x'
8 years ago
90eb58252e
Add support for `spring.redis.url` property
...
Update `RedisAutoConfiguration` to optionally configure Redis using a
`spring.redis.url` property`.
Closes gh-7395
8 years ago
1f7b3cad45
Polish Kafka properties
...
Closes gh-7672
8 years ago
bdda470305
Support arbitrary Kafka properties
...
Add support for arbitrary Kafka properties via
`spring.kafka.properties.*` and also a `spring.kafka.max.poll.records`
property.
See gh-7672
8 years ago
99e72664d9
Polish spring transaction manager properties
...
Polish and update contribution so that TransactionManager properties can
be defined per technology, rather than globally.
Closes gh-7561
8 years ago
534a9db6fd
Make stop wait time in the launch script configurable
...
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.
Fixes gh-7121
8 years ago
998ff2feee
Merge branch '1.5.x'
8 years ago
851ce2286f
Allow to override Couchbase's CustomConversions
...
Closes gh-7700
8 years ago
1f417997f3
Merge branch '1.5.x'
8 years ago
4b9cba351b
Merge branch '1.4.x' into 1.5.x
8 years ago
bd74c3d327
Polish formatting
8 years ago
e578ace7d7
Polish doc formatting
8 years ago
f03da0b4f7
Merge branch '1.5.x'
8 years ago
9668006aea
Merge branch '1.4.x' into 1.5.x
8 years ago
3237e4ab3e
Add link between reference and how-to
...
See gh-7652
8 years ago
90658c5274
Merge branch '1.5.x'
8 years ago
f46bd35a60
Merge branch '1.4.x' into 1.5.x
8 years ago
69dce2881b
Remove outdated (and duplicated) section
...
Closes gh-7667
8 years ago
e3496614be
Merge branch '1.5.x'
8 years ago
21b815aabd
Polish contribution
...
Closes gh-7560
8 years ago
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
8 years ago
1782d778db
Merge branch '1.5.x'
8 years ago
6fb1fb580d
Upgrade to Dependency Management Plugin 1.0.0.RC1
...
Closes gh-7636
8 years ago
5331c41b6d
Merge branch '1.5.x'
8 years ago
4e9abbbc25
Merge branch '1.4.x' into 1.5.x
8 years ago
37605e3576
Document devtools influence on HTTP cache headers
...
This commits documents the fact that, amongst its property defaults,
devtools is disabling the HTTP cache headers when serving static
resources with Spring MVC.
Fixes gh-7516
8 years ago
1302d1b0e4
Merge branch '1.5.x'
8 years ago
dd7d81a580
INIT INFO Required Start/Stop as embedded launch script properties
...
Expose the Required-Start and Require-Stop lines in the launch script
INIT INFO section as customizable embedded launch script properties.
This way one can express dependencies fron other init services by simply
changing the configuration in the build script.
Closes gh-7555
8 years ago
0ea3277769
Merge branch '1.5.x'
8 years ago
0fbe56eabc
Merge branch '1.4.x' into 1.5.x
8 years ago
c8bdf74327
Expand ConfigurationProperties doc
...
Closes gh-7620
8 years ago
a86678cc31
Merge branch '1.5.x'
8 years ago
703ed901fe
Polish doc
8 years ago
e5f2c58a7a
Polish
...
Closes gh-7632
8 years ago
5b636a00b7
Merge branch '1.5.x'
8 years ago
e002e03b3e
Merge branch '1.4.x' into 1.5.x
8 years ago
9746c63209
Update production-ready-features.adoc
...
Replace line break with missing line fold "\\\n" to continue the property
value.
Closes gh-7596
8 years ago
fa492e3ac8
Merge branch '1.5.x'
8 years ago
8a50dae01a
Add missing entry for `server.tomcat.accesslog.buffered`
...
See gh-7456
8 years ago
816c236e5b
Merge branch '1.5.x'
8 years ago
ee72e788ed
Rename `spring-boot-junit-runners` to `spring-boot-test-support`
...
Closes gh-7421
8 years ago
f454adca1a
Merge branch '1.4.x' into 1.5.x
8 years ago
d9bd211062
Link to correct branch on GitHub from snapshot documentation
...
Closes gh-7548
8 years ago
995b962807
Merge branch '1.5.x'
8 years ago
8494635a05
Merge branch '1.4.x' into 1.5.x
8 years ago
b798b5a40b
Update docs to reflect Gradle plugin being available in the Plugin Portal
...
Closes gh-1567
8 years ago
ede0b0f940
Merge branch '1.5.x'
8 years ago
c127c1fdf9
Polish doc
...
Closes gh-7381
8 years ago
9f1e90d3c0
Merge branch '1.4.x' into 1.5.x
8 years ago
36981259a5
Document that CRaSH commands written in Java are not supported
...
Closes gh-7471
8 years ago
a4770f90dc
Merge branch '1.5.x'
8 years ago
2c630b5c61
Validate schema and data resources
...
Previously, if a user specifies a path to a schema or data DDL that does
not exist, the application will start up fine and the missing DDL would
not be reported.
This commit validates that user-defined resources actually exist and
throw a new `ResourceNotFoundException` if they don't.
Closes gh-7088
8 years ago
2dbebf67e8
Merge branch '1.5.x'
8 years ago
7c02daabc3
Polish contribution
...
Closes gh-7533
8 years ago
c654eff41b
Update doc for spring.data.neo4j.open-in-view
...
See gh-7533
8 years ago
0568afc6cb
Merge branch '1.5.x'
8 years ago
423f8037ce
Polish
...
Closes gh-7530
8 years ago
bfa0514acb
Merge branch '1.5.x'
8 years ago
d373de903b
Fix broken doc formatting
...
Closes gh-7522
8 years ago
2577d79ff1
Merge branch '1.5.x'
8 years ago
b618c70e52
Add test slice for pure jdbc tests
...
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.
Closes gh-6563
8 years ago
e8d476dbca
Fix use of `forceCreation` flag in `maven-jar-plugin`
8 years ago
450ab28163
Merge branch '1.5.x'
8 years ago
c6c6524b40
Support custom fat jar layouts
...
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.
See gh-7263
8 years ago
4c01e940ea
Merge branch '1.5.x'
8 years ago
50c39661ad
Merge branch '1.4.x' into 1.5.x
8 years ago
491bd745de
Document Jersey's package scanning limitations
...
Closes gh-7496
8 years ago
4a10cfe112
Merge branch '1.5.x'
8 years ago
f64d5303cf
Document and test array support for spring.profiles.*
...
Closes gh-7175
Closes gh-6995
8 years ago
f260cd9a07
Merge branch '1.5.x'
8 years ago
0befc310cd
Add dedicated settings for maxHttpPostSize
...
This commit deprecates `server.max-http-post-size` and introduces a
dedicated property for each supported container. In particular, Undertow
can now define a max size higher than 2GB.
Closes gh-7362
8 years ago
3bfbbeb9f4
Merge branch '1.5.x'
8 years ago
22208f6a9e
Auto-configure validation constraints on bean methods
...
This commit auto-configures `MethodValidationPostProcessor` if necessary
when a JSR-303 validator implementation is detected on the classpath.
Closes gh-6228
8 years ago
e687d3aeba
Merge branch '1.5.x'
8 years ago
c9fa1a1f70
Merge branch '1.4.x' into 1.5.x
8 years ago
0359b2f6f5
Document how to disable JMS transacted session
...
Closes gh-7463
8 years ago
2f57e1885a
Merge branch '1.5.x'
8 years ago
ea023618a4
Polish upgrade to Spring Session 1.3.0.RC1
...
Closes gh-7457
8 years ago
ffec6fddd2
Upgrade Spring Session to 1.3.0.RC1
...
See gh-7457
8 years ago
ab3a001286
Merge branch '1.5.x'
8 years ago
dc237043b8
Merge branch '1.4.x' into 1.5.x
8 years ago
74670cb20f
Allow WebDriver beans to define their own scope
...
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.
Fixes gh-7454
8 years ago
e0dfff2b23
Merge branch '1.5.x'
8 years ago
b6b8bef009
Polish
8 years ago
bc6b2a9c75
Merge branch '1.5.x'
8 years ago
5c11059e1d
Make launch script's logFilename and pidFilename configurable via properties
...
Closes gh-7234
8 years ago
fd2b417252
Merge branch '1.5.x'
8 years ago
d12c21ae2f
Add spring-kafka dependency to spring-boot-docs for Javadoc links
...
See gh-6961
8 years ago
e3688455fa
Merge branch '1.5.x'
8 years ago
642af52d01
Polish "Apache Kafka support" contribution
...
Closes gh-6961
8 years ago
c4188c8e4a
Add Apache Kafka support
...
See gh-6961
8 years ago
20d7dd5747
Merge branch '1.5.x'
8 years ago
1657120286
Move ModifiedClassPathRunner to its own module
...
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.
Fixes gh-7420
8 years ago
9273b1789b
Merge branch '1.5.x'
8 years ago
1cd781b242
Make spring-boot-test compatible with Mockito 2.1 and 2.2
...
We use some internal Mockito classes and some breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.
To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.
Closes gh-6520
8 years ago
7ebe324514
Merge branch '1.5.x'
8 years ago
2ba3b27954
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
# spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
8 years ago
0072a93915
Expose Tomcat's accesslog requestAttributesEnabled
...
This commit adds an extra property to the `server.tomcat.accesslog` to
control the `reqestAttributesEnabled` flag. This flag sets request
attributes for IP address, Hostname, protocol and port used for the
request.
Closes gh-7367
8 years ago
22edb9eded
Merge branch '1.5.x'
8 years ago
7b742fd792
Polish
...
See gh-7357
8 years ago
cb7c0b5031
Merge branch '1.5.x'
8 years ago
d7bbea63b7
Add properties for content security policy
...
Add `content-security-policy` and `content-security-policy-mode`
`security.header` properties and update auto-configuration to apply
them when specified.
Fixes gh-7373
Closes gh-7357
8 years ago
8038882d46
Polish
...
Closes gh-7403
8 years ago
d8b7d6dfdc
Merge branch '1.5.x'
8 years ago
00099552db
Add Logger actuator documentation
...
Add Actuator and Reference documentation for the `/logger` endpoint.
This documentation includes information on listing, reading, and
modifying the configuration of loggers.
Closes gh-7390
See gh-7086
8 years ago
6aa57e8ffe
Merge branch '1.5.x'
8 years ago
2b8801a6b5
Merge branch '1.4.x' into 1.5.x
8 years ago
6b681ddfab
Upgrade Thymeleaf 3 layout dialect in doc
...
Closes gh-7370
8 years ago
e712a9ba8c
Next Development Version
8 years ago
e4be5c6102
Merge branch '1.5.x'
8 years ago
389acb094b
Merge branch '1.4.x' into 1.5.x
8 years ago
ec9f0ab6b4
Polish
...
Closes gh-7322
8 years ago
229691338e
Reinstate JsonPath dependency that is no longer pulled in transitively
8 years ago
4486d2d209
Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
...
Closes gh-7301
See gh-7029
8 years ago
5a88e47414
Merge branch '1.5.x'
8 years ago
f3ac98aa82
Merge branch '1.4.x' into 1.5.x
8 years ago
8350238b8c
Polish doc
...
See gh-5137
8 years ago
97597ca54f
Merge branch '1.5.x'
8 years ago
1b38528333
Polish doc
...
Closes gh-7170
8 years ago
7c3d7d882a
Merge branch '1.5.x'
8 years ago
ef3395beaa
Raise the minimum supported version of Gradle to 2.9
...
Closes gh-6884
8 years ago
f28fa3e1ab
Merge branch '1.5.x'
8 years ago
a733c62689
Fix typo
8 years ago
d58c79d9b7
Merge branch '1.5.x'
8 years ago
20e8c36590
Merge branch '1.4.x' into 1.5.x
8 years ago
6828997651
Correct minimum recommended version of Gradle to be 2.9 rather than 2.8
...
Closes gh-7189
See gh-6884
8 years ago
14d58b49dd
Merge branch '1.5.x'
8 years ago
8b631390ba
Merge branch '1.4.x' into 1.5.x
8 years ago
307fd94b4f
Correct typo in the documentation for RestTemplateBuilder customization
...
See gh-7054
8 years ago
5bc8101725
Merge branch '1.5.x'
8 years ago
ffbbd2a5f8
Merge branch '1.4.x' into 1.5.x
8 years ago
be78dc4b99
Flesh out the documentation on RestTemplateBuilder customization
...
Closes gh-7054
8 years ago
98a3ae9ac4
Merge branch '1.5.x'
8 years ago
97fee46682
Revert Layout changes
...
This reverts commits:
- 974ec92ad6537e0c12c2500a3df6e9
8 years ago
713f4dd723
Merge branch '1.5.x'
8 years ago
4f06e52d7e
Allow adding additional tld skip patterns
...
This commit improves `TomcatEmbeddedServletContainerFactory` so that tld
skip patterns can be set or added to an existing set. An additional
`server.tomcat.additional-tld-skip-patterns` is now being exposed to
easily add patterns via configuration.
Closes gh-5010
8 years ago
5f5e3bf6c3
Merge branch '1.5.x'
8 years ago
537e0c12c2
Support for custom layout types to change loader classes
...
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
8 years ago
99af8ca414
Merge branch '1.5.x'
8 years ago
c4d8fb1c09
Merge branch '1.4.x' into 1.5.x
8 years ago
6d50e26b70
Polish contribution
...
Closes gh-7215
8 years ago
1546cd4072
Update documentation on Actuator hypermedia support
...
Spring Boot Actuator hypermedia support has been disabled by default via
c7c685f
8 years ago
1448902c14
Merge branch '1.5.x'
8 years ago
f6959ccbcd
Merge branch '1.4.x' into 1.5.x
8 years ago
7f8849c62b
Merge branch '1.3.x' into 1.4.x
8 years ago
5863e6f78c
Fix class name in generated meta-data
...
Previously, the algorithm that computes the String representation of a
class reference and a property type was shared. This lead to generic
information for group's `type` and `sourceType` property.
This commit separates that logic in two: `getQualifiedName` is now
responsible to generate a fully qualified class name while the existing
`getType` is solely responsible to generate a type representation for the
property. Only the latter has generic information.
Closes gh-7236
8 years ago
bbea134e1c
Merge branch '1.5.x'
8 years ago
ed7de8eb60
Polish contribution
...
Also add rotate attribute to Undertow
Closes gh-7225
8 years ago
547a3554dd
Merge branch '1.5.x'
8 years ago
b37b3f7c59
Merge pull request #7224 from ajayk:adoc-indentation
...
* pr/7224:
Fix indentation for spring.jms.template.* keys
8 years ago
548190673c
Fix indentation for spring.jms.template.* keys
...
Closes gh-7224
8 years ago
f0798253a3
Merge branch '1.5.x'
8 years ago
5b9eaab6c0
Merge branch '1.4.x' into 1.5.x
8 years ago
ee7141cf63
Allow PropertyLauncher loader.path to be configured using manifest
...
Closes gh-7178
8 years ago
7be16c7b54
Merge branch '1.5.x'
8 years ago
a56bf44b39
Merge branch '1.4.x' into 1.5.x
8 years ago
8150cbd0d1
Remove commentary on Neo4j's licence
...
Closes gh-7214
8 years ago
e509278580
Merge branch '1.5.x'
8 years ago
eddb10e4c9
Merge branch '1.4.x' into 1.5.x
8 years ago
469a4e3444
Improve systemd service documentation
...
Closes gh-6954
8 years ago
363798e9ad
Fix unresolved merge commit
...
Closes gh-7206
8 years ago
7fc2566650
Merge branch '1.5.x'
8 years ago
b0474b7c9d
Merge branch '1.4.x' into 1.5.x
8 years ago
4621f82b0e
Correct typo in docs
...
Closes gh-7203
8 years ago
702d904d53
Merge branch '1.5.x'
8 years ago
d7e2708687
Merge branch '1.4.x' into 1.5.x
8 years ago
999fa123df
Deprecate support for Gradle 2.7 and earlier
8 years ago
8a547facd1
Merge branch '1.5.x'
8 years ago
c9e6aff374
Merge branch '1.4.x' into 1.5.x
8 years ago
639b0f554d
Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
...
Closes gh-7112
8 years ago
57450042bb
Merge branch '1.5.x'
8 years ago
7962818294
Merge branch '1.4.x' into 1.5.x
8 years ago
6ac041c43b
Update Thymeleaf 3 related versions in docs and sample
...
See gh-6991
Closes gh-7183
8 years ago
3dd0b9d59a
Merge branch '1.5.x'
8 years ago
7d68c14d03
Merge branch '1.4.x' into 1.5.x
8 years ago
4b1ddddea3
Update docs on using Thmyeleaf 3 to reference latest version
...
Closes gh-7183
8 years ago
d79546da74
Merge branch '1.5.x'
8 years ago
6186262ecc
Switch `excludeDevtools` to true by default
...
Switch the default value of `excludeDevtools` from `false` to `true` as
it is more sensible to exclude such dependency by default.
Closes gh-7170
8 years ago
d65a843856
Merge branch '1.5.x'
8 years ago
2d995661f4
Merge branch '1.4.x' into 1.5.x
8 years ago
00a10bcf61
Restore checkstyle
...
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.
See gh-7142
8 years ago
d5c3a8ac76
Merge branch '1.5.x'
8 years ago
c6f23000be
Merge branch '1.4.x' into 1.5.x
8 years ago
11cad9e0cb
Fix sample in ref doc
...
Closes gh-7142
8 years ago
b0cbe1fdc7
Merge branch '1.5.x'
8 years ago
f254e1227f
Merge branch '1.4.x' into 1.5.x
8 years ago
0d3318796e
Merge branch '1.3.x' into 1.4.x
8 years ago
bd2956c3f0
Fix `metricsFilter` reference in doc
...
Closes gh-7147
8 years ago
c5cc626d48
Remove remote shell support
...
See gh-7044
8 years ago
66a3df454f
Merge branch '1.5.x'
8 years ago
cfee9bab81
Deprecate remote shell support
...
Closes gh-7044
8 years ago
7f2806bd19
Merge branch '1.5.x'
8 years ago
6fb53f90e5
Polish contribution
...
Closes gh-6666
8 years ago
92db3b4803
Merge branch '1.5.x'
8 years ago
18c3d42f45
Merge branch '1.4.x' into 1.5.x
8 years ago
e87cf937e1
Add missing parentheses
...
Closes gh-7137
8 years ago
98f14f2ee9
Polish documentation
...
Closes gh-2642
8 years ago
097c64a91b
Merge branch '1.5.x'
8 years ago
ab2a2579c8
Polish contribution
...
Closes gh-6571
8 years ago
0480a96166
Merge branch '1.5.x'
8 years ago
98b30416ca
Merge branch '1.4.x' into 1.5.x
8 years ago
9861cb7e9c
Expand the note regarding LiveReload
...
See gh-7080
8 years ago
3a86e26977
Merge branch '1.5.x'
8 years ago
5435f03690
Merge branch '1.4.x' into 1.5.x
8 years ago
2c64661b58
Fix typo
...
Closes gh-7127
8 years ago
5a2eae5628
Merge branch '1.5.x'
8 years ago
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
8 years ago
b54566c0cd
Merge branch '1.5.x'
8 years ago
f82e91df39
Merge branch '1.4.x' into 1.5.x
8 years ago
03961e6692
Polish contribution
...
Closes gh-7004
8 years ago
89b1ff1fac
Merge branch '1.5.x'
8 years ago
f684bcc9e5
Merge branch '1.4.x' into 1.5.x
8 years ago
0f97ccf2fa
Clarify dependency override instructions for Thymeleaf 3
...
Closes gh-7097
8 years ago
fe10ea73b0
Merge branch '1.4.x' into 1.5.x
8 years ago
ad3e5c04bb
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
8 years ago
f137ec6a3a
Merge branch '1.5.x'
8 years ago
846f264da8
Merge branch '1.4.x' into 1.5.x
8 years ago
77f1da871f
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
8 years ago
8b61d15120
Remove deprecated support for commons-dbcp 1
...
See gh-6787
8 years ago
543498f040
Merge branch '1.5.x'
8 years ago
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
8 years ago
0d5985b8dd
Merge branch '1.5.x'
8 years ago
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
8 years ago
fc1a700d4c
Merge branch '1.5.x'
...
# Conflicts:
# spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
8 years ago
4b2970606e
Merge branch '1.4.x' into 1.5.x
8 years ago
7019894f0e
Clarify the role of spring-boot-starter-cache
...
The cache abstraction is a core feature of the Spring Framework. Basic
features such as `@EnableCaching` are therefore available by default with
no extra dependencies necessary.
However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and
Guava are located in a separated module, `spring-context-support`. Spring
Boot provides that artifact via the `spring-boot-starter-cache` starter.
It is quite easy to "only" add the cache library dependencies and forget
about this extra dependencies since `@EnableCaching` is available by
default. This commit clarifies the role of the starer in each section so
that it is more obvious. We're already explaining this at the beginning
of the section but it seems that's not enough.
Closes gh-7071
8 years ago
39534aea6b
Merge branch '1.5.x'
...
# Conflicts:
# spring-boot-dependencies/pom.xml
8 years ago
58050fb72f
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-dependencies/pom.xml
8 years ago
0926b66123
Fix a typo
...
Closes gh-7085
8 years ago
e6ab3cef73
Merge branch '1.5.x'
8 years ago
6977dcaf44
Merge branch '1.4.x' into 1.5.x
8 years ago
9f7e97b23f
Improve war to executable app documentation
...
Closes gh-7040
8 years ago
f181421f67
Merge branch '1.5.x'
8 years ago
8ad477537e
Fail fast if both uri and client attributes are set
...
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.
This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.
Closes gh-6739
8 years ago
b95b57dbf5
Merge branch '1.5.x'
8 years ago
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
8 years ago
503d735fdd
Polish
...
Closes gh-7081
8 years ago
df9fb51a92
Merge branch '1.5.x'
8 years ago
75f475f2c8
Merge branch '1.4.x' into 1.5.x
8 years ago
914becac0e
Fix thymeleaf-layout-dialect.version in doc
...
Version 2.0.0 had serval bugs which broke compatibility to older
templates, so the guide should refer the fixed version instead.
Closes gh-6991
8 years ago
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
8 years ago
241ab10160
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
Shubham Aggarwal
Spring Buildmaster
Phillip Webb
Artem Bilan
Marco Aust
Gary Russell
Lucas Saldanha
Andy Wilkinson
Brian Clozel
Alessandro Falappa
Johannes Harth
Johnny Lim
Dave Syer
Phillip Johnson
Vedran Pavic
Christian Koops
Christoffer Sawicki
Ben Hale
Emanuel Rabina
ajk
Ken Dombeck
Raja Dilip Kolli
Michael J. Simons
Aurélien Leboulanger
Dan Stine
Michael Stummvoll