10933 Commits (1f37da5b069e7390b8585ae41eb5f5b28f718540)

 

All Branches   

Search

Author	SHA1	Message	Date
Stephane Nicoll	9f7e97b23f	Improve war to executable app documentation ... Closes gh-7040	8 years ago
Stephane Nicoll	e5bac8dadf	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	a9b610c4fc	Deprecate ResourceLoaderAware callback ... Closes gh-6986	8 years ago
Stephane Nicoll	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
Stephane Nicoll	42adeda6a3	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	dc067b0fc4	Update Ant sample’s spring-boot-antlib dependency during prepare ... Closes gh-6978	8 years ago
Stephane Nicoll	3d9c56fbf3	Merge branch '1.4.x' into 1.5.x ... # Conflicts: # spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java # spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java	8 years ago
Stephane Nicoll	8c1b736bb0	Fix list property to be mutable ... Closes gh-7068	8 years ago
Stephane Nicoll	e643fc5bd1	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	4dfdce5a49	Merge pull request #7081 from izeye:polish-20161002 ... * pr/7081: Polish	8 years ago
Johnny Lim	503d735fdd	Polish ... Closes gh-7081	8 years ago
Stephane Nicoll	75f475f2c8	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	8feef4560b	Merge pull request #6991 from Stummi:patch-1 ... * pr/6991: Fix thymeleaf-layout-dialect.version in doc	8 years ago
Michael Stummvoll	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
Stephane Nicoll	7ffa499949	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	e56119165e	Close JestClient on shutdown ... Closes gh-7051	8 years ago
Stephane Nicoll	8ed20068ca	Fix list property to be mutable ... Closes gh-7045	8 years ago
Andy Wilkinson	901aa2764b	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	cf4142dbc0	Prevent htmlunit from pulling in commons-logging ... Update dependency management to exclude commons-logging and add an enforcer rule to spring-boot-samples to try and prevent unwanted commons-logging dependencies from sneaking back in again. Closes gh-7067	8 years ago
Andy Wilkinson	b495ed4772	Merge pull request #7064 from Ken Dombeck ... * gh-7064: Prevent spring-session from pulling in commons-logging	8 years ago
Ken Dombeck	8034ae6e37	Prevent spring-session from pulling in commons-logging ... Closes gh-7064	8 years ago
Andy Wilkinson	733cfe9f70	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	51eb1ac04d	Declare embedded queue up front in samples that use Artemis ... Closes gh-7063	8 years ago
Andy Wilkinson	2a035d0748	Remove support for Velocity following its deprecation in 1.4 ... Closes gh-6971	8 years ago
Andy Wilkinson	464915d2cc	Remove support for HornetQ following its deprecation in 1.4 ... See gh-6971	8 years ago
Andy Wilkinson	0232e3b16c	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	d08c84af42	Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration ... Closes gh-7062	8 years ago
Andy Wilkinson	b4d052a7b3	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	33ea73996e	Make auto-config for Narayana back off when Transaction SPI not on classpath ... Closes gh-7061	8 years ago
Andy Wilkinson	26c9d5a7e2	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	bacdc204ae	Polish imports	8 years ago
Andy Wilkinson	cd45ce9104	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	1bb5dc205d	Update samples to use Artemis in place of HornetQ ... Closes gh-7057	8 years ago
Stephane Nicoll	323c749352	Merge pull request #7023 from vpavic:gh-5101 ... * pr/7023: Upgrade Hazelcast to 3.7.1	8 years ago
Vedran Pavic	c4aa78679a	Upgrade Hazelcast to 3.7.1 ... In addition, dependency management for `hazelcast-hibernate5` module has been added, and a separate dependency version was introduced for `hazelcast-hibernate4` module. Closes gh-7023	8 years ago
Stephane Nicoll	cdd59707fc	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	bfd62aba10	Merge pull request #7030 from izeye:polish-20160927 ... * pr/7030: Polish	8 years ago
Johnny Lim	30a677646f	Polish ... Closes gh-7030	8 years ago
Andy Wilkinson	b186e3f1ef	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	73f153daca	Use a property for the version of the JMS API managed dependency ... Closes gh-7042	8 years ago
Andy Wilkinson	4e377cc489	Merge pull request #6979 from Vedran Pavić ... * gh-6979: Upgrade Spring Session to 1.3.0.M2	8 years ago
Vedran Pavic	f485660482	Upgrade Spring Session to 1.3.0.M2 ... Closes gh-6979	8 years ago
Andy Wilkinson	0b28844681	Merge pull request #7022 from Kazuki Shimizu ... * gh-7022: Add dependency management for jetty-proxy	8 years ago
Kazuki Shimizu	c90eac5136	Add dependency management for jetty-proxy ... Closes gh-7022	8 years ago
Andy Wilkinson	22b33908c2	Upgrade to Spring Integration Java DSL 1.2.0.RC1 ... Closes gh-7000	8 years ago
Stephane Nicoll	9210bf0822	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	a2794d75c3	Clarify couchbase cache requirements ... Closes gh-6998	8 years ago
Stephane Nicoll	d5be773f0e	Merge pull request #7025 from izeye:fix-dir ... * pr/7025: Move Restarter in integration tests	8 years ago
Johnny Lim	723b46ade4	Move Restarter in integration tests ... Closes gh-7025	8 years ago
Stephane Nicoll	542e935bb6	Fix typo ... Closes gh-7026	8 years ago