root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
8,714 Commits 23 Branches 348 Tags 293 MiB
Commit Graph

8714 Commits

Author SHA1 Message Date
Andy Wilkinson 2469f0ba28 Clarify effect of @EnableWebSecurity when Actuator's being used 
Closes gh-6490
 2016-07-27 16:17:25 +01:00
Stephane Nicoll bf8ae27a47 Merge pull request #6486 from otrosien:patch-1 
* pr/6486:
  Add WireMock Spring Boot starter reference
 2016-07-27 15:53:19 +02:00
Oliver Trosien fe80aa6ec5 Add WireMock Spring Boot starter reference 
Closes gh-6486
 2016-07-27 15:52:41 +02:00
Andy Wilkinson 267532b0c5 Merge pull request #6487 from Johnny Lim 
* gh-6487:
  Polish
 2016-07-27 12:29:52 +01:00
Johnny Lim 9627d0ed66 Polish 
Closes gh-6487
 2016-07-27 12:29:33 +01:00
Stephane Nicoll eb444f547f Fix typo 2016-07-27 09:20:19 +02:00
Phillip Webb 162b9e84a3 Polish 2016-07-26 22:47:51 -07:00
Phillip Webb 618e6d6bf4 Merge pull request #6461 from bijukunjummen/gradle-debug-fix 
* pr/6461:
  Update Gradle remote debug documentation
 2016-07-26 22:17:28 -07:00
Biju Kunjummen d7a1730b50 Update Gradle remote debug documentation 
Update the documentation to reference the `bootRun` command rather
than `run`.

Closes gh-6461
 2016-07-26 22:17:20 -07:00
Phillip Webb 753a7e1d33 Document how to to customize the TestRestTemplate 
Update the reference documentation and add some additional Javadoc to
provide hints on how to customize the `TestRestTemplate`.

Fixes gh-6465
 2016-07-26 22:08:53 -07:00
Phillip Webb 0660f52abb Merge pull request #6482 from chadluo/patch-1 
* patch-1:
  Unescape quotation marks in JavaDoc
 2016-07-26 21:42:49 -07:00
Chad 18dd125059 Unescape quotation marks in JavaDoc 
Closes gh-6482
 2016-07-26 21:42:22 -07:00
Phillip Webb 296dc7132b Allow JSON Testers to be `@Autowired` 
Switch `@AutoConfigureJsonTesters` to use regular `@Autowired` injection
for JSON testers. Prior to this commit JSON Tester fields were
initialized directly which caused IDE issues and was also a little
confusing.

Fixes gh-6451
 2016-07-26 21:41:37 -07:00
Andy Wilkinson a44cc196de Merge branch '1.3.x' 2016-07-26 21:23:21 +01:00
Andy Wilkinson 7e116f6bab Upgrade to thymeleaf-extras-conditionalcomments 2.1.2.RELEASE 
Closes gh-6480
 2016-07-26 21:20:45 +01:00
Andy Wilkinson 1682d7b9d4 Upgrade to Jedis 2.8.2 
Closes gh-6481
 2016-07-26 21:19:04 +01:00
Andy Wilkinson 26c2c54a47 Upgrade to Spring REST Docs 1.1.1.RELEASE 
Closes gh-6479
 2016-07-26 21:19:03 +01:00
Andy Wilkinson 4e84111b43 Upgrade to Selenium 2.53.1 
Closes gh-6478
 2016-07-26 21:19:03 +01:00
Andy Wilkinson 5b40a276dc Upgrade to Neo4j OGM 2.0.4 
Closes gh-6477
 2016-07-26 21:19:03 +01:00
Andy Wilkinson 222fda447c Upgrade to jOOQ 3.8.4 
Closes gh-6476
 2016-07-26 21:19:03 +01:00
Andy Wilkinson 9c98c8cbc4 Upgrade to Elasticsearch 2.3.4 
Closes gh-6475
 2016-07-26 21:19:02 +01:00
Andy Wilkinson cdcc8a411d Upgrade to Jetty 9.3.11.v20160721 
Closes gh-6474
 2016-07-26 21:19:02 +01:00
Andy Wilkinson ec7a9a32b9 Upgrade to AssertJ 2.5.0 
Closes gh-6473
 2016-07-26 21:19:02 +01:00
Andy Wilkinson 58ccd18253 Upgrade to Log4J2 2.6.2 
Closes gh-6472
 2016-07-26 21:01:06 +01:00
Andy Wilkinson e15353bbd6 Upgrade to ActiveMQ 5.13.4 
Closes gh-6471
 2016-07-26 21:00:40 +01:00
Andy Wilkinson ec3084c3d6 Upgrade to App Engine API 1.9.40 
Closes gh-6470
 2016-07-26 20:55:28 +01:00
Andy Wilkinson 77b0b5ba00 Upgrade to Jackson 2.8.1 
Closes gh-6469
 2016-07-26 20:54:20 +01:00
Andy Wilkinson e9fd90af87 Merge pull request #6459 from Kazuki Shimizu 
* gh-6459:
  Upgrade to Lombok 1.16.10
 2016-07-26 20:52:29 +01:00
Kazuki Shimizu 7b12183e7b Upgrade to Lombok 1.16.10 
Closes gh-6459
 2016-07-26 20:51:47 +01:00
Andy Wilkinson e683e8f062 Merge branch '1.3.x' 2016-07-26 20:40:25 +01:00
Andy Wilkinson 4a40f8d5c4 Upgrade to Postgresql 9.4.1209.jre7 
Closes gh-6468
 2016-07-26 20:38:23 +01:00
Andy Wilkinson 9a02252ee6 Upgrade to Freemarker 2.3.25-incubating 
Closes gh-6467
 2016-07-26 20:37:39 +01:00
Andy Wilkinson 11ce8d79ad Upgrade to Jetty 9.2.18.v20160721 
Closes gh-6466
 2016-07-26 20:30:45 +01:00
Andy Wilkinson c308aa7ebf Merge branch '1.3.x' 2016-07-26 15:10:41 +01:00
Andy Wilkinson f3353be428 Merge pull request #6458 from Artem Bilan 
* gh-6458:
  Upgrade to Spring Integration 4.2.9.RELEASE
 2016-07-26 15:09:53 +01:00
Artem Bilan 5969c5dcc5 Upgrade to Spring Integration 4.2.9.RELEASE 
Closes gh-6458
 2016-07-26 15:08:27 +01:00
Brian Clozel a282710fc9 Add Locale to Charset Mapping for Servlet containers 
This commit adds a new configuration key:

    spring.http.encoding.mapping.<locale>=<charset>

This allows to specify which default charset should be used for any
given Locale, if none has been provided already in the response itself.
This applies to all supported embedded servlet containers.

Fixes gh-6453
 2016-07-26 12:17:11 +02:00
Stephane Nicoll 01f73d257f Merge pull request #6462 from vpavic:docs 
* pr/6462:
  Move "Using jOOQ" section under "Working with SQL databases" section
 2016-07-26 09:49:09 +02:00
Vedran Pavic 7669c3c468 Move "Using jOOQ" section under "Working with SQL databases" section 
Closes gh-6462
 2016-07-26 09:48:35 +02:00
Phillip Webb 769d393c7a Merge pull request #6456 from artembilan/SI-4.3.1 
* SI-4.3.1:
  Upgrade to Spring Integration 4.3.1
 2016-07-25 17:02:50 -07:00
Artem Bilan c59fa6881f Upgrade to Spring Integration 4.3.1 
Closes gh-6456
 2016-07-25 17:02:08 -07:00
Phillip Webb 9fa85a9336 Merge pull request #6449 from kazuki43zoo/multi-datasource 
* multi-datasource:
  Add JdbcTemplate only on single DataSource
  Add TransactionManager only on single DataSource
 2016-07-25 17:00:23 -07:00
Kazuki Shimizu 5ecb68b226 Add JdbcTemplate only on single DataSource 
Update auto-configuration logic so that a `JdbcTemplate`
is only added when there is a single candidate DataSource bean.

Closes gh-6449
 2016-07-25 16:59:53 -07:00
Kazuki Shimizu e0adacbeae Add TransactionManager only on single DataSource 
Update auto-configuration logic so that a `DataSourceTransactionManager`
is only added when there is a single candidate DataSource bean.

See gh-6449
 2016-07-25 16:59:30 -07:00
Phillip Webb 496b3a8d75 Relocate FileWriters to `spring-boot` 
Move ApplicationPidFileWriter and EmbeddedServerPortFileWriter to the
core spring-boot project since they're not really tied to the actuator.

Fixes gh-6398
 2016-07-25 13:45:29 -07:00
Phillip Webb 4a1e0d4544 Extend @AutoConfigureMockMvc print support 
Update @AutoConfigureMockMvc to support extended print options including
`System.err` and `log.debug`. In addition the "default" print option
can now be overridden by adding `spring.test.mockmvc.print=...` to
`src/test/resources/application.properties`.

Fixes gh-6455
 2016-07-25 13:17:26 -07:00
Phillip Webb 8355d8516b Add @UnmappedPropertyValue support 
Update @PropertyMapping support to allow single enum values to be marked
as an @UnmappedPropertyValue. This change is primarily so that users can
replace "default" values globally for across all tests.

See gh-6455
 2016-07-25 13:13:16 -07:00
Phillip Webb ab9834a92e Merge pull request #6442 from izeye/checkstyle 
* checkstyle:
  Remove severity elements from checkstyle.xml
 2016-07-25 10:31:13 -07:00
Johnny Lim 65128c0ad1 Remove severity elements from checkstyle.xml 
Remove `error` severity elements from `checkstyle.xml` and rely on the
default setting instead.

Closes gh-6442
 2016-07-25 10:30:58 -07:00
Phillip Webb 254b099bfd Polish 2016-07-25 10:23:35 -07:00