spring-boot

Commit Graph

Author	SHA1	Message	Date
Stephane Nicoll	669b09cbde	Merge branch '1.5.x'	9 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	9 years ago
Stephane Nicoll	8c1b736bb0	Fix list property to be mutable Closes gh-7068	9 years ago
Stephane Nicoll	b95b57dbf5	Merge branch '1.5.x'	9 years ago
Stephane Nicoll	e643fc5bd1	Merge branch '1.4.x' into 1.5.x	9 years ago
Stephane Nicoll	4dfdce5a49	Merge pull request #7081 from izeye:polish-20161002 * pr/7081: Polish	9 years ago
Johnny Lim	503d735fdd	Polish Closes gh-7081	9 years ago
Stephane Nicoll	df9fb51a92	Merge branch '1.5.x'	9 years ago
Stephane Nicoll	75f475f2c8	Merge branch '1.4.x' into 1.5.x	9 years ago
Stephane Nicoll	8feef4560b	Merge pull request #6991 from Stummi:patch-1 * pr/6991: Fix thymeleaf-layout-dialect.version in doc	9 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	9 years ago
Stephane Nicoll	8f96278ce9	Merge branch '1.5.x'	9 years ago
Stephane Nicoll	7ffa499949	Merge branch '1.4.x' into 1.5.x	9 years ago
Stephane Nicoll	e56119165e	Close JestClient on shutdown Closes gh-7051	9 years ago
Stephane Nicoll	8ed20068ca	Fix list property to be mutable Closes gh-7045	9 years ago
Andy Wilkinson	d3d58bb2d2	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	901aa2764b	Merge branch '1.4.x' into 1.5.x	9 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	9 years ago
Andy Wilkinson	b495ed4772	Merge pull request #7064 from Ken Dombeck * gh-7064: Prevent spring-session from pulling in commons-logging	9 years ago
Ken Dombeck	8034ae6e37	Prevent spring-session from pulling in commons-logging Closes gh-7064	9 years ago
Andy Wilkinson	f82dc8e043	Upgrade to JMS API 2.0 Closes gh-7049	9 years ago
Andy Wilkinson	4d64c9c93d	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	733cfe9f70	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	51eb1ac04d	Declare embedded queue up front in samples that use Artemis Closes gh-7063	9 years ago
Andy Wilkinson	241ab10160	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	2a035d0748	Remove support for Velocity following its deprecation in 1.4 Closes gh-6971	9 years ago
Andy Wilkinson	464915d2cc	Remove support for HornetQ following its deprecation in 1.4 See gh-6971	9 years ago
Andy Wilkinson	ae7faa233a	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	0232e3b16c	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	d08c84af42	Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration Closes gh-7062	9 years ago
Andy Wilkinson	0e018c6037	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	b4d052a7b3	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	33ea73996e	Make auto-config for Narayana back off when Transaction SPI not on classpath Closes gh-7061	9 years ago
Andy Wilkinson	ec285f03c3	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	26c9d5a7e2	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	bacdc204ae	Polish imports	9 years ago
Andy Wilkinson	3e058e038f	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	cd45ce9104	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	1bb5dc205d	Update samples to use Artemis in place of HornetQ Closes gh-7057	9 years ago
Stephane Nicoll	8b6d7eedc0	Merge branch '1.5.x'	9 years ago
Stephane Nicoll	323c749352	Merge pull request #7023 from vpavic:gh-5101 * pr/7023: Upgrade Hazelcast to 3.7.1	9 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	9 years ago
Stephane Nicoll	49a606fa91	Merge branch '1.5.x'	9 years ago
Stephane Nicoll	cdd59707fc	Merge branch '1.4.x' into 1.5.x	9 years ago
Stephane Nicoll	bfd62aba10	Merge pull request #7030 from izeye:polish-20160927 * pr/7030: Polish	9 years ago
Johnny Lim	30a677646f	Polish Closes gh-7030	9 years ago
Andy Wilkinson	306d9473ab	Merge branch '1.5.x'	9 years ago
Andy Wilkinson	b186e3f1ef	Merge branch '1.4.x' into 1.5.x	9 years ago
Andy Wilkinson	73f153daca	Use a property for the version of the JMS API managed dependency Closes gh-7042	9 years ago
Andy Wilkinson	63796a2a82	Merge branch '1.5.x'	9 years ago

1 2 3 4 5 ...

8964 Commits (669b09cbde753e8d4e09539a1f68c80ca0e6111a) All Branches Search

8964 Commits (669b09cbde753e8d4e09539a1f68c80ca0e6111a)

All Branches