Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,705 Commits 23 Branches 0 Tags
2dbebf67e8911fe952dde1673d93be3fef635ed0
Commit Graph

9705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
2dbebf67e8 Merge branch '1.5.x' 2016-11-30 10:56:14 +01:00
Stephane Nicoll
619addcbde Merge pull request #7533 from izeye:update-doc 
* pr/7533:
  Polish contribution
  Update doc for spring.data.neo4j.open-in-view
 2016-11-30 10:56:01 +01:00
Stephane Nicoll
7c02daabc3 Polish contribution 
Closes gh-7533
 2016-11-30 10:55:32 +01:00
Johnny Lim
c654eff41b Update doc for spring.data.neo4j.open-in-view 
See gh-7533
 2016-11-30 10:42:18 +01:00
Stephane Nicoll
f718e9e5d5 Merge pull request #7530 from izeye:polish-20161130 
* pr/7530:
  Polish
 2016-11-30 10:41:57 +01:00
Stephane Nicoll
0568afc6cb Merge branch '1.5.x' 2016-11-30 08:31:41 +01:00
Stephane Nicoll
ce66abdeac Merge pull request #7530 from izeye:polish-20161130 
* pr/7530:
  Polish
 2016-11-30 08:31:32 +01:00
Johnny Lim
423f8037ce Polish 
Closes gh-7530
 2016-11-30 08:31:13 +01:00
Stephane Nicoll
e7275b62dc Merge branch '1.5.x' 2016-11-30 08:27:30 +01:00
Stephane Nicoll
b35b7664b8 Merge pull request #7527 from oscr:fix-redundant-tostring 
* pr/7527:
  Remove redundant toString() invocation
 2016-11-30 08:27:18 +01:00
Oscar Utbult
fabe35fdc4 Remove redundant toString() invocation 
Closes gh-7527
 2016-11-30 08:23:03 +01:00
Stephane Nicoll
96ca884450 Merge branch '1.5.x' 2016-11-29 18:07:58 +01:00
Stephane Nicoll
80da80f930 Make sure that test data sources are unique 2016-11-29 18:07:36 +01:00
Stephane Nicoll
bfa0514acb Merge branch '1.5.x' 2016-11-29 17:01:37 +01:00
Stephane Nicoll
941c53dceb Merge pull request #7522 from izeye:fix-doc 
* pr/7522:
  Fix broken doc formatting
 2016-11-29 17:00:15 +01:00
Johnny Lim
d373de903b Fix broken doc formatting 
Closes gh-7522
 2016-11-29 17:00:02 +01:00
Andy Wilkinson
633280d1d0 Merge branch '1.5.x' 2016-11-29 15:44:31 +00:00
Andy Wilkinson
1595286e04 Prefer @SpringBootApplication-annotated class when finding main class 
Closes gh-6496
 2016-11-29 15:44:10 +00:00
Stephane Nicoll
fa0bb9cac4 Merge branch '1.5.x' 2016-11-29 15:37:16 +01:00
Stephane Nicoll
ba61faee5e Remove trailing char 2016-11-29 15:37:05 +01:00
Stephane Nicoll
4da5245e69 Merge branch '1.5.x' 2016-11-29 15:22:20 +01:00
Stephane Nicoll
06b2f12509 Merge pull request #7491 from hrishi2323:gh-5434 
* pr/7491:
  Polish contribution
  Detect default values defined in the parent
 2016-11-29 15:22:05 +01:00
Stephane Nicoll
f84fd19eaa Polish contribution 
Closes gh-7491
 2016-11-29 15:20:53 +01:00
Hrishikesh Joshi
b3220985bb Detect default values defined in the parent 
Closes gh-5434
 2016-11-29 15:20:10 +01:00
Stephane Nicoll
2577d79ff1 Merge branch '1.5.x' 2016-11-29 14:54:38 +01:00
Stephane Nicoll
b618c70e52 Add test slice for pure jdbc tests 
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.

Closes gh-6563
 2016-11-29 14:54:15 +01:00
Andy Wilkinson
82a847c8b0 Merge branch '1.5.x' 2016-11-29 11:11:45 +00:00
Andy Wilkinson
0265a05dc9 Rename appengine.version to avoid clash with Appe Engine's Maven plugin 
Closes gh-7433
 2016-11-29 11:10:28 +00:00
Stephane Nicoll
e8d476dbca Fix use of forceCreation flag in maven-jar-plugin 2016-11-29 11:28:14 +01:00
Stephane Nicoll
fcb405ebde Merge branch '1.5.x' 2016-11-29 10:04:49 +01:00
Stephane Nicoll
140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll
cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Phillip Webb
a055ef8614 Fix parent POM version following 1.5.x merge 2016-11-28 23:12:49 -08:00
Stephane Nicoll
9c374e7755 Merge branch '1.5.x' 2016-11-29 08:03:08 +01:00
Stephane Nicoll
06e44c71ec Merge branch '1.4.x' into 1.5.x 2016-11-29 08:02:50 +01:00
Stephane Nicoll
d89cf94397 Merge pull request #7510 from oscr:fix-redundant-tostring 
* pr/7510:
  Remove redundant toString() invocation
 2016-11-29 08:02:01 +01:00
Oscar Utbult
88b83a909c Remove redundant toString() invocation 
Closes gh-7510
 2016-11-29 08:01:27 +01:00
Phillip Webb
068a38fb2e Downgrade maven-assembly-plugin to 2.6 
Downgrade `maven-assembly-plugin` from 3.0 to 2.6 since the later
version contains a bug that means `recompressZippedFiles` is not
respected.

See gh-7513
 2016-11-28 21:02:20 -08:00
Phillip Webb
450ab28163 Merge branch '1.5.x' 2016-11-28 17:27:05 -08:00
Phillip Webb
d0c3ece0ea Merge pull request #7263 from dsyer/feature/custom-layout 
* gh-7263-2:
  Add custom LayoutFactory sample
  Support custom fat jar layouts
  Rework Repacakger timeout code
 2016-11-28 17:25:47 -08:00
Phillip Webb
8432c52369 Add custom LayoutFactory sample 
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
 2016-11-28 16:31:53 -08:00
Dave Syer
c6c6524b40 Support custom fat jar layouts 
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.

See gh-7263
 2016-11-28 16:31:53 -08:00
Phillip Webb
f5b03c81f3 Rework Repacakger timeout code 
Pull up common timeout code into Repackager and remove the need for
custom subclasses.

See gh-7263
 2016-11-28 16:15:39 -08:00
Phillip Webb
fe63c981f8 Merge branch '1.5.x' 2016-11-28 15:40:20 -08:00
Phillip Webb
dada7423b0 Polish 2016-11-28 15:40:08 -08:00
Phillip Webb
b4c3f4f504 Merge branch '1.5.x' 2016-11-28 15:37:43 -08:00
Phillip Webb
ec73144240 Fix warnings 2016-11-28 15:31:49 -08:00
Phillip Webb
5ed00b3501 Merge branch '1.4.x' into 1.5.x 2016-11-28 15:27:07 -08:00
Phillip Webb
9fdb563d5a Polish 2016-11-28 15:27:01 -08:00
Phillip Webb
357d072a60 Polish 2016-11-28 15:14:46 -08:00