spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 18:29:03 +00:00
Code Issues Projects Releases Wiki Activity
9,868 Commits 28 Branches 395 Tags
74b754bec27f611069500d97db8ff9d854855fcf
Commit Graph
9868 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 74b754bec2 Merge branch '1.5.x' 2016-12-15 14:28:27 +01:00
Stephane Nicoll 61518dd574 Merge branch '1.4.x' into 1.5.x 2016-12-15 14:28:14 +01:00
Raja Dilip Kolli caf5327149 Upgrade to Lombok 1.16.12 
Closes gh-7590
 2016-12-15 14:27:53 +01:00
Stephane Nicoll 1302d1b0e4 Merge branch '1.5.x' 2016-12-15 14:16:28 +01:00
Stephane Nicoll d18ee71cb9 Merge pull request #7555 from AlexFalappa:master 
* pr/7555:
  INIT INFO Required Start/Stop as embedded launch script properties
 2016-12-15 14:15:29 +01:00
Alessandro Falappa 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
 2016-12-15 14:14:50 +01:00
Stephane Nicoll 6fd9476339 Merge pull request #7590 from rajadileepkolli:master 
* pr/7590:
  Upgrade to Lombok 1.16.12
 2016-12-15 14:13:12 +01:00
Raja Dilip Kolli 4ce91a5366 Upgrade to Lombok 1.16.12 
Closes gh-7590
 2016-12-15 14:12:38 +01:00
Stephane Nicoll 1d8783b5b3 Add dependency management for javax.validation 
Closes gh-7641
 2016-12-15 14:10:45 +01:00
Stephane Nicoll 8e4af4154c Merge branch '1.5.x' 2016-12-15 14:03:30 +01:00
Stephane Nicoll ac866707d5 Merge branch '1.4.x' into 1.5.x 2016-12-15 14:02:51 +01:00
Stephane Nicoll a2d46dc16c Upgrade to Logback 1.1.8 
Closes gh-7638
 2016-12-15 14:01:03 +01:00
Stephane Nicoll bf8509d27e Merge branch '1.5.x' 2016-12-15 13:38:45 +01:00
Stephane Nicoll fc3a457366 Merge branch '1.4.x' into 1.5.x 2016-12-15 13:38:31 +01:00
Stephane Nicoll 601b5ced49 Upgrade to Neo4j 2.0.6 
Closes gh-7650
 2016-12-15 13:37:39 +01:00
Stephane Nicoll 3153594199 Merge branch '1.5.x' 2016-12-15 10:44:36 +01:00
Stephane Nicoll 2b09050568 Merge branch '1.4.x' into 1.5.x 2016-12-15 10:44:22 +01:00
Stephane Nicoll 477c874eca Improve DatabaseDriver detection based on jdbc url 
This commit fixes the detection of JDBC urls for DB2 AS400, Firebird and
Informix.

Closes gh-7651
 2016-12-15 10:39:03 +01:00
Stephane Nicoll 0ea3277769 Merge branch '1.5.x' 2016-12-15 09:21:24 +01:00
Stephane Nicoll 0fbe56eabc Merge branch '1.4.x' into 1.5.x 2016-12-15 09:21:11 +01:00
Stephane Nicoll c8bdf74327 Expand ConfigurationProperties doc 
Closes gh-7620
 2016-12-15 09:20:24 +01:00
Stephane Nicoll a86678cc31 Merge branch '1.5.x' 2016-12-14 19:33:34 +01:00
Stephane Nicoll 703ed901fe Polish doc 2016-12-14 19:19:19 +01:00
Stephane Nicoll eb64cd00d8 Merge pull request #7632 from eddumelendez:missing_health_metadata 
* pr/7632:
  Polish
  Add missing actuator metadata
 2016-12-14 19:18:52 +01:00
Stephane Nicoll e5f2c58a7a Polish 
Closes gh-7632
 2016-12-14 19:18:36 +01:00
Eddú Meléndez fc09a23991 Add missing actuator metadata 
Health metadata for cassandra and couchbase is added.

See gh-7632
 2016-12-14 19:16:42 +01:00
Stephane Nicoll 2a5e22fa63 Merge pull request #7552 from izeye:polish-20161202 
* pr/7552:
  Polish
 2016-12-14 19:14:49 +01:00
Johnny Lim 6d1b752ffe Polish 
Closes gh-7552
 2016-12-14 19:14:24 +01:00
Stephane Nicoll 41f29aeccc Merge pull request #7551 from oscr:redundant-array-test 
* pr/7551:
  Remove redundant array creation for calling varargs method
 2016-12-14 19:12:41 +01:00
Oscar Utbult 38713c473f Remove redundant array creation for calling varargs method 
Closes gh-7551
 2016-12-14 19:12:08 +01:00
Stephane Nicoll 5b636a00b7 Merge branch '1.5.x' 2016-12-14 19:09:33 +01:00
Stephane Nicoll e002e03b3e Merge branch '1.4.x' into 1.5.x 2016-12-14 19:09:18 +01:00
Stephane Nicoll cfad35ad21 Merge pull request #7596 from 166MMX:patch-1 
* pr/7596:
  Update production-ready-features.adoc
 2016-12-14 19:08:31 +01:00
Johannes Harth 9746c63209 Update production-ready-features.adoc 
Replace line break with missing line fold "\\\n" to continue the property
value.

Closes gh-7596
 2016-12-14 19:06:39 +01:00
Andy Wilkinson 0f83351d72 Merge branch '1.5.x' 2016-12-14 16:35:26 +00:00
Andy Wilkinson 78517a6571 Merge branch '1.4.x' into 1.5.x 2016-12-14 16:35:19 +00:00
Andy Wilkinson 4d5fb97127 Revert "Start building against Spring Framework 4.3.5 snapshots" 
This reverts commit 727d626292. Sigh,
although the SPR issue is complete the change hasn't been backported
yet.
 2016-12-14 16:33:55 +00:00
Andy Wilkinson e32e0ea0c5 Start building against Spring Batch 4.0 snapshots 
See gh-7645
 2016-12-14 15:07:39 +00:00
Andy Wilkinson 8d6c6bae9f Merge branch '1.5.x' 2016-12-14 15:01:02 +00:00
Andy Wilkinson 99edb0cec0 Merge branch '1.4.x' into 1.5.x 2016-12-14 15:00:50 +00:00
Andy Wilkinson 727d626292 Start building against Spring Framework 4.3.5 snapshots 
See gh-7601
 2016-12-14 14:59:38 +00:00
Andy Wilkinson 5a4a7409c9 Merge branch '1.5.x' 2016-12-13 13:02:59 +00:00
Andy Wilkinson 595679bed4 Disable management security when testing Jolokia endpoint 2016-12-13 13:02:40 +00:00
Andy Wilkinson cea00f22b1 Merge branch '1.5.x' 2016-12-13 12:41:48 +00:00
Andy Wilkinson 149f19cd58 Register any EventListener beans with auto-configured SessionFactory 
Closes gh-7531
 2016-12-13 12:41:29 +00:00
Andy Wilkinson 0db924c369 Upgrade to Neo4j OGM 2.1.0 
Closes gh-7633
 2016-12-13 12:23:15 +00:00
Andy Wilkinson e75eaf996f Merge branch '1.5.x' 2016-12-13 10:02:56 +00:00
Andy Wilkinson d9e2368512 Merge branch '1.4.x' into 1.5.x 2016-12-13 10:02:52 +00:00
Andy Wilkinson 14a90aa52e Update SpringApplicationBuilder javadoc to reflect API changes 
Closes gh-7609
 2016-12-13 10:02:00 +00:00
Andy Wilkinson 133284c1c4 Merge branch '1.5.x' 2016-12-13 09:46:25 +00:00