root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
8,896 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

8896 Commits

Author SHA1 Message Date
Gary Russell ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3 
Closes gh-7074
 2016-10-04 12:59:41 +02:00
Stephane Nicoll dfb3675937 Merge pull request #7085 from dstine:docs-typos 
* pr/7085:
  Fix a typo
 2016-10-04 12:59:02 +02:00
Dan Stine 0926b66123 Fix a typo 
Closes gh-7085
 2016-10-04 12:58:37 +02:00
Phillip Webb bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
Phillip Webb cdeed8e934 Merge pull request #7089 from mbhave/gh-7065 
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
 2016-10-03 22:27:42 -07:00
Madhura Bhave 16fe332f51 Fix NoClassDefFoundError when Mockito is missing 
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
 2016-10-03 22:27:20 -07:00
Phillip Webb 3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Phillip Webb 39ed0d4dfb Polish 2016-10-03 21:58:13 -07:00
Phillip Webb f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation 
Closes gh-7040
 2016-10-03 12:28:25 +02:00
Stephane Nicoll a9b610c4fc Deprecate ResourceLoaderAware callback 
Closes gh-6986
 2016-10-03 11:42:46 +02:00
Stephane Nicoll dc067b0fc4 Update Ant sample’s spring-boot-antlib dependency during prepare 
Closes gh-6978
 2016-10-03 11:03:45 +02:00
Stephane Nicoll 8c1b736bb0 Fix list property to be mutable 
Closes gh-7068
 2016-10-03 10:40:46 +02:00
Stephane Nicoll 4dfdce5a49 Merge pull request #7081 from izeye:polish-20161002 
* pr/7081:
  Polish
 2016-10-02 11:08:13 +02:00
Johnny Lim 503d735fdd Polish 
Closes gh-7081
 2016-10-02 11:07:04 +02:00
Stephane Nicoll 8feef4560b Merge pull request #6991 from Stummi:patch-1 
* pr/6991:
  Fix thymeleaf-layout-dialect.version in doc
 2016-10-01 13:20:18 +02:00
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
 2016-10-01 13:18:37 +02:00
Stephane Nicoll e56119165e Close JestClient on shutdown 
Closes gh-7051
 2016-09-30 10:51:48 +02:00
Stephane Nicoll 8ed20068ca Fix list property to be mutable 
Closes gh-7045
 2016-09-30 10:34:25 +02:00
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
 2016-09-29 21:08:15 +01:00
Andy Wilkinson b495ed4772 Merge pull request #7064 from Ken Dombeck 
* gh-7064:
  Prevent spring-session from pulling in commons-logging
 2016-09-29 21:07:29 +01:00
Ken Dombeck 8034ae6e37 Prevent spring-session from pulling in commons-logging 
Closes gh-7064
 2016-09-29 21:06:05 +01:00
Andy Wilkinson 51eb1ac04d Declare embedded queue up front in samples that use Artemis 
Closes gh-7063
 2016-09-29 16:28:40 +01:00
Andy Wilkinson d08c84af42 Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration 
Closes gh-7062
 2016-09-29 15:08:24 +01:00
Andy Wilkinson 33ea73996e Make auto-config for Narayana back off when Transaction SPI not on classpath 
Closes gh-7061
 2016-09-29 14:56:05 +01:00
Andy Wilkinson bacdc204ae Polish imports 2016-09-29 14:27:42 +01:00
Andy Wilkinson 1bb5dc205d Update samples to use Artemis in place of HornetQ 
Closes gh-7057
 2016-09-29 11:52:09 +01:00
Stephane Nicoll bfd62aba10 Merge pull request #7030 from izeye:polish-20160927 
* pr/7030:
  Polish
 2016-09-28 16:46:14 +02:00
Johnny Lim 30a677646f Polish 
Closes gh-7030
 2016-09-28 16:45:19 +02:00
Andy Wilkinson 73f153daca Use a property for the version of the JMS API managed dependency 
Closes gh-7042
 2016-09-28 12:23:15 +01:00
Stephane Nicoll a2794d75c3 Clarify couchbase cache requirements 
Closes gh-6998
 2016-09-27 10:12:59 +02:00
Stephane Nicoll d5be773f0e Merge pull request #7025 from izeye:fix-dir 
* pr/7025:
  Move Restarter in integration tests
 2016-09-27 10:05:01 +02:00
Johnny Lim 723b46ade4 Move Restarter in integration tests 
Closes gh-7025
 2016-09-27 10:04:38 +02:00
Stephane Nicoll 542e935bb6 Fix typo 
Closes gh-7026
 2016-09-27 10:03:00 +02:00
Stephane Nicoll f1fddd243b Document spring.http.encoding.mapping 
Closes gh-7017
 2016-09-26 10:35:45 +02:00
Andy Wilkinson e1d53b65ba Remove redundant git-commit-id-plugin configuration from loader-tools 
Closes gh-7007
 2016-09-23 13:56:38 +01:00
Stephane Nicoll c81a83522c Merge pull request #7002 from candrews:patch-3 
* pr/7002:
  Exclude `META-INF/build-info.properties` from restart
 2016-09-23 07:59:59 +02:00
Craig Andrews d94eedfd8a Exclude `META-INF/build-info.properties` from restart 
Prior to this commit any application configured to write
`META-INF/build-info.properties` could trigger unexpected application
restarts. The problem is particularly prevalent when using Eclipse M2E in
combination with Maven's `spring-boot-maven-plugin` `build-info` goal
and Gradle's `springBoot` `buildInfo()`.

Closes gh-7002
 2016-09-23 07:58:39 +02:00
Stephane Nicoll 85fb273596 Fix spring-boot-antlib version 
See gh-6978
 2016-09-22 07:52:02 +02:00
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Phillip Webb 51092af739 Polish 2016-09-20 14:32:09 -07:00
Phillip Webb 0b9667c26f Drop setResolvePlaceholders() 
Remove setResolvePlaceholders() from PropertySourcesPropertyValues
and instead rely only on the constructor.

See gh-6964
 2016-09-20 14:22:51 -07:00
Phillip Webb 7896ec5a7b Polish 2016-09-20 14:20:52 -07:00
Stephane Nicoll 7fd169cfd2 Merge branch '1.3.x' 2016-09-20 22:54:01 +02:00
Stephane Nicoll 04a72fcb78 Fixup version numbers following release 2016-09-20 22:53:40 +02:00
Andy Wilkinson be33827f49 Simplify property validation sample and document need for static bean method 
Closes gh-6627
 2016-09-20 21:33:31 +01:00
Spring Buildmaster 5f959b074f Next Development Version 2016-09-20 20:20:06 +00:00
Stephane Nicoll 43e020ef7b Merge branch '1.3.x' 2016-09-20 19:59:42 +02:00
Stephane Nicoll 4bf94ef3ca Upgrade to Spring Data Gosling SR5 
Closes gh-6956
 2016-09-20 19:58:43 +02:00
Dave Syer 5af4446386 Bump spring-retry to 1.1.4 2016-09-20 14:22:25 +01:00