spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 02:09:06 +00:00
Code Issues Projects Releases Wiki Activity
11,387 Commits 24 Branches 395 Tags
3915f37daecb67f47f49b3876376d1a268e0cc2e
Commit Graph
11387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 3915f37dae Merge branch '1.5.x' 2017-04-03 10:42:41 +03:00
Stephane Nicoll 5cc2e103f2 Disable unexpected datasource initialization 
This commit restore the disabling of datasource initialization that was
accidently removed in db33a75 so that other tests aren't affected by it.
 2017-04-03 10:42:12 +03:00
Stephane Nicoll 4c32d6a7de Merge branch '1.5.x' 2017-04-03 09:50:36 +03:00
Stephane Nicoll 0163731043 Automatically enable transaction management for Neo4j 
This commit makes sure that `@EnableTransactionManagement` is
auto-configured with Neo4j. It actually reuses what was done in #8434,
making sure that the `Neo4jDataAutoConfiguration` is ordered properly.

Closes gh-8587
 2017-04-03 09:37:37 +03:00
Stephane Nicoll db33a75484 Enable transaction management consistently 
Previously to this commit, transaction management was only enabled when
a `DataSource` is configured. The processing of `@Transactional`
annotations are now enabled as long as a `PlatformTransactionManager` is
present.

Also, the `spring.aop.proxy-target-class` is now honoured if set, still
defaulting to CGLIB mode.

Closes gh-8434
 2017-04-03 09:24:15 +03:00
Stephane Nicoll 13e5d98560 Merge pull request #8618 from eddumelendez:gh-8609 
* pr/8618:
  Polish "Add @DataNeo4jTest" contribution
  Add @DataNeo4jTest
 2017-04-02 16:34:28 +02:00
Stephane Nicoll b08016f15a Polish "Add @DataNeo4jTest" contribution 
Closes gh-8618
 2017-04-02 12:38:24 +02:00
Eddú Meléndez b6feb47574 Add @DataNeo4jTest 
This commit adds test infrastructure for Neo4j repositories through
`@DataNeo4jTest`.

See gh-8618
 2017-04-02 08:21:00 +02:00
Stephane Nicoll 4b42e68aa6 Merge pull request #8791 from izeye:patch-22 
* pr/8791:
  Update doc for add-application-context-header
 2017-04-01 11:28:06 +02:00
Johnny Lim 1ed5108639 Update doc for add-application-context-header 
Closes gh-8791
 2017-04-01 11:27:42 +02:00
Brian Clozel ba3b83c739 Fix dependency scope for reactor-test 
This is a test dependency and should be marked as such.

Fixes gh-8789
 2017-03-31 17:26:45 +02:00
Stephane Nicoll 4a8d353263 Merge branch '1.5.x' 2017-03-31 15:10:08 +02:00
Stephane Nicoll 751cd6e0b2 Merge pull request #8781 from ptamarit:short-commit-id-custom-length 
* pr/8781:
  Polish "Use git.commit.id.abbrev if present" contribution
  Use git.commit.id.abbrev if present
 2017-03-31 15:09:54 +02:00
Stephane Nicoll 52527c7298 Polish "Use git.commit.id.abbrev if present" contribution 
Closes gh-8781
 2017-03-31 15:09:43 +02:00
Pablo Tamarit 30b6166bc1 Use git.commit.id.abbrev if present 
Currently GitProperties always shortens the property git.commit.id to an
hardcoded length of 7.

However, both the Maven plugin git-commit-id-plugin and the Gradle
plugin gradle-git-properties are now providing the property
git.commit.id.abbrev along with the propery git.commit.id.
Moreover, the Maven plugin allows to customize the length of the
abbreviated commit ID with the configuration abbrevLength. The Gradle
plugin doesn't allow (yet) to configure this length.

Closes gh-8773
 2017-03-31 15:09:43 +02:00
Andy Wilkinson 5b2f0ea070 Revert "Add dep mgmt for fast-classpath-scanner while Neo4j uses LATEST" 
This reverts commit 51a2d9b103.

See gh-8687
 2017-03-31 11:30:01 +01:00
Andy Wilkinson f52b0b975a Update WebFlux auto-configuration following recent API changes 2017-03-31 11:27:09 +01:00
Andy Wilkinson 99aa155412 Update tests that use WebClient following changes to its API 2017-03-29 21:02:57 +01:00
Andy Wilkinson bf83e74d5f Start building against Reactor Bom Aluminium snapshots for SR2 again 
See gh-8589
 2017-03-29 19:44:52 +01:00
Stephane Nicoll 1e88e1faa5 Upgrade to Embedded Mongo 2.0.0 
Closes gh-8769
 2017-03-29 11:11:47 +02:00
Brian Clozel df2d6b370e Fix compilation error with latest webflux changes 
See commit c5bcefbd in Spring Framework, which refactored
the RequestMappingHandlerAdapter.
 2017-03-29 09:56:04 +02:00
Andy Wilkinson 4ca38d4563 Merge branch '1.5.x' 2017-03-28 20:00:21 +01:00
Andy Wilkinson 181cfd5ca8 Merge branch '1.4.x' into 1.5.x 2017-03-28 20:00:03 +01:00
Andy Wilkinson 9fa8f2e317 Tweak Checkstyle plugin config so violations are output even with -q 
Closes gh-8767
 2017-03-28 19:59:08 +01:00
Andy Wilkinson e683f8ace9 Revert "Start building against Reactor Bom Aluminium snapshots for SR2 again" 
This reverts commit 9164265a54.

See gh-8589
 2017-03-28 15:18:34 +01:00
Andy Wilkinson 9164265a54 Start building against Reactor Bom Aluminium snapshots for SR2 again 
See gh-8589
 2017-03-28 10:18:23 +01:00
Andy Wilkinson aaf76e435e Align with latest Neo4j OGM 3.0 snapshots 
See gh-8687
 2017-03-28 10:09:36 +01:00
Stephane Nicoll ff50331168 Merge branch '1.5.x' 2017-03-28 10:27:31 +02:00
Stephane Nicoll d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
Stephane Nicoll 595fada2ff Merge pull request #8660 from dreis2211:cleanup-equals-exceptions 
* pr/8660:
  Fix test assertions
 2017-03-28 10:26:56 +02:00
dreis 1266642aba Fix test assertions 
Closes gh-8660
 2017-03-28 10:26:25 +02:00
Stephane Nicoll 113279c1bc Merge pull request #8678 from zeldan:patch-1 
* pr/8678:
  Fix propdeps-plugin url in doc
 2017-03-28 10:25:47 +02:00
Dániel Zelei cc30adf0df Fix propdeps-plugin url in doc 
Closes gh-8678
 2017-03-28 10:15:43 +02:00
Stephane Nicoll ae1475dcb8 Merge pull request #8698 from izeye:polish-20160323 
* pr/8698:
  Polish
 2017-03-28 10:09:23 +02:00
Johnny Lim 287520a810 Polish 
Closes gh-8698
 2017-03-28 10:06:00 +02:00
Stephane Nicoll ee0a151671 Merge branch '1.5.x' 2017-03-28 10:05:47 +02:00
Stephane Nicoll 49b8d8c482 Polish 
See gh-8698
 2017-03-28 10:05:33 +02:00
Stephane Nicoll 90b3e2472d Merge pull request #8699 from izeye:add-test-20170323 
* pr/8699:
  Add a missing test for "Fix properties parsing for comment chars"
 2017-03-28 10:01:59 +02:00
Johnny Lim 46a0aaac7a Add a missing test for "Fix properties parsing for comment chars" 
Closes gh-8699
 2017-03-28 10:01:27 +02:00
Madhura Bhave 8bfd42e3f1 Add v2 content type to actuator endpoints 
Closes gh-7968
 2017-03-27 11:10:44 -07:00
Stephane Nicoll 28a4d5e01b Merge branch '1.5.x' 2017-03-26 12:12:09 +02:00
Stephane Nicoll c6182d510c Merge branch '1.4.x' into 1.5.x 2017-03-26 12:11:54 +02:00
Stephane Nicoll 22869f78a9 Merge pull request #8718 from andersonkyle:fix-typo 
* pr/8718:
  Fix typo
 2017-03-26 12:10:32 +02:00
Kyle Anderson 57977a654a Fix typo 
Closes gh-8718
 2017-03-26 12:10:04 +02:00
Stephane Nicoll 9b2b1a3a28 Merge pull request #8686 from dreis2211:empty-string-concat 
* pr/8686:
  Replace empty string concatenation with String.valueOf()
 2017-03-26 12:03:59 +02:00
dreis 5d85733378 Replace empty string concatenation with String.valueOf() 
Closes gh-8686
 2017-03-26 12:03:36 +02:00
Andy Wilkinson d322d8613b Upgrade to Flyway 4.1.2 
Closes gh-8752
 2017-03-25 20:41:43 +00:00
Andy Wilkinson 57a1aa579e Merge branch '1.5.x' 2017-03-25 20:00:33 +00:00
Andy Wilkinson e905c96d9d Upgrade to GemFire 8.2.3 
Closes gh-8498
 2017-03-25 19:59:54 +00:00
Andy Wilkinson c6aa032cd5 Drop back to Aluminium-SR1 as current snapshots are beyond repair 
This reverts 78824b02f3

See gh-8589
 2017-03-25 19:49:44 +00:00