Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,490 Commits 23 Branches 0 Tags
38891f7594debeef320ebcfc7050e9234f407dcf
Commit Graph

27490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
8108b556ad Fix resource cleanup in test 
Closes gh-18569
 2019-10-13 13:41:50 +02:00
Stephane Nicoll
f7959bcd00 Merge branch '2.1.x' 
Closes gh-18567
 2019-10-13 08:45:44 +02:00
Stephane Nicoll
e05c48986b Merge pull request #18546 from tedyoung 
* pr/18546:
  Fix incorrect backslash escape in documentation sample

Closes gh-18546
 2019-10-13 08:45:02 +02:00
Ted M. Young
f553784ebc Fix incorrect backslash escape in documentation sample 
See gh-18546
 2019-10-13 08:10:14 +02:00
Stephane Nicoll
f6901a505e Merge pull request #18558 from jaferkhan 
* pr/18558:
  Fix package in AOP pointcut

Closes gh-18558
 2019-10-13 08:08:05 +02:00
Jafer Khan
56840f32fe Fix package in AOP pointcut 
See gh-18558
 2019-10-13 08:06:13 +02:00
Stephane Nicoll
53b0569dae Merge pull request #18557 from dreis2211 
* pr/18557:
  Polish
  Remove usage of @InjectMocks

Closes gh-18557
 2019-10-12 16:56:47 +01:00
dreis2211
d8de6fff53 Polish 
See gh-18557
 2019-10-12 16:55:07 +01:00
dreis2211
3174f06bf2 Remove usage of @InjectMocks 
See gh-18557
 2019-10-12 16:54:57 +01:00
Stephane Nicoll
498ae649a8 Merge pull request #18559 from izeye 
* pr/18559:
  Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()

Closes gh-18559
 2019-10-12 16:53:51 +01:00
Johnny Lim
887c3b71f3 Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable() 
See gh-18559
 2019-10-12 16:51:53 +01:00
Andy Wilkinson
9a89039172 Provide a marker artifact for Boot's Gradle plugin 
Closes gh-18514
 2019-10-11 16:51:29 -05:00
Stephane Nicoll
61a914fa28 Polish 2019-10-11 10:39:23 -05:00
Stephane Nicoll
06a288c305 Merge pull request #18552 from clove506 
* pr/18552:
  Polish "Remove boxing"
  Remove boxing

Closes gh-18552
 2019-10-11 10:37:58 -05:00
Stephane Nicoll
40bd98a3f4 Polish "Remove boxing" 
See gh-18552
 2019-10-11 10:35:19 -05:00
clove506
fe6da39e1b Remove boxing 
See gh-18552
 2019-10-11 10:32:59 -05:00
Stephane Nicoll
e9892be4ee Merge pull request #18531 from izeye 
* pr/18531:
  Polish

Closes gh-18531
 2019-10-11 10:29:43 -05:00
Johnny Lim
d60d59434d Polish 
See gh-18531
 2019-10-11 10:29:22 -05:00
Andy Wilkinson
3211d756bf Merge pull request #18548 from polarbear567 
* gh-18548:
  Fix ImmutableConfigurationProperties import statement in ref docs

Closes gh-18548
 2019-10-10 07:36:13 -05:00
leoli
2b5f8f36a2 Fix ImmutableConfigurationProperties import statement in ref docs 
See gh-18548
 2019-10-10 07:34:46 -05:00
Andy Wilkinson
e62ca778e9 Merge branch '2.1.x' 
Closes gh-18554
 2019-10-10 07:29:57 -05:00
Andy Wilkinson
a7d199330a Merge pull request #18539 from dreis2211 
* gh-18539:
  Remove accidental usage of UnsupportedOptionException

Closes gh-18539
 2019-10-10 07:29:12 -05:00
dreis2211
ba46ab6a4f Remove accidental usage of UnsupportedOptionException 
See gh-18539
 2019-10-10 07:28:51 -05:00
Stephane Nicoll
2229b8fa4e Merge pull request #18544 from dreis2211 
* pr/18544:
  Fix formatting issue

Closes gh-18544
 2019-10-08 14:12:08 -05:00
dreis2211
09b9d18d88 Fix formatting issue 
See gh-18544
 2019-10-08 14:11:50 -05:00
Andy Wilkinson
bd0dcb68ae Merge pull request #18541 from dreis2211 
* gh-18541:
  Fix checkstyle warning

Closes gh-18541
 2019-10-08 12:24:40 -05:00
dreis2211
e70a5686bf Fix checkstyle warning 
See gh-18541
 2019-10-08 12:21:05 -05:00
Stephane Nicoll
a171ed8649 Merge pull request #18538 from michael-simons 
* pr/18538:
  Polish "Use dedicated method to turn off authentication"
  Use dedicated method to turn off authentication

Closes gh-18538
 2019-10-08 11:14:47 -05:00
Stephane Nicoll
32a1cdf4d3 Polish "Use dedicated method to turn off authentication" 
See gh-18538
 2019-10-08 11:13:51 -05:00
Michael Simons
04a01a49c2 Use dedicated method to turn off authentication 
See gh-18538
 2019-10-08 11:08:48 -05:00
Andy Wilkinson
b11f50c2a0 Merge pull request #18534 from OLPMO 
* gh-18534:
  Polish "Polish"
  Polish

Closes gh-18534
 2019-10-08 07:39:24 -05:00
Andy Wilkinson
b5243c5076 Polish "Polish" 
See gh-18534
 2019-10-08 07:38:53 -05:00
Kant Leung
2f73e196af Polish 
See gh-18534
 2019-10-08 07:38:21 -05:00
Stephane Nicoll
897ef4d20c Merge pull request #18524 from izeye 
* pr/18524:
  Remove a duplicate assertion

Closes gh-18524
 2019-10-07 08:19:25 -05:00
Johnny Lim
e9e6c925e8 Remove a duplicate assertion 
See gh-18524
 2019-10-07 08:19:11 -05:00
Andy Wilkinson
002b2709d9 Document auditevent and httptrace endpoints' need for repositories 
Closes gh-18352
 2019-10-07 07:22:10 -05:00
Andy Wilkinson
8b9890eb5d Remove Woodstox dependency management after Jackson upgrade 
The upgrade to Jackson 2.10.0 means that the possibility of getting
an incompatible combination of Woodstox and the StAX API when
building with Maven has gone. This commit removes the dependency
management as it was only added to work around the incompatibility
in Jackson's transitive dependencies.

Closes gh-18500
 2019-10-03 17:39:55 +01:00
Andy Wilkinson
078536aded Merge branch '2.1.x' 
Closes gh-18502
 2019-10-03 15:34:32 +01:00
Andy Wilkinson
f42b442ce2 Fix handling of encoded URLs in Class-Path manifest attribute 
Fixes gh-18410
 2019-10-03 15:30:33 +01:00
Andy Wilkinson
bc8a88d734 Upgrade to Webjars Locator Core 0.41 
Closes gh-18497
 2019-10-03 08:27:51 +01:00
Andy Wilkinson
b7e434d5f8 Upgrade to Mockito 3.1.0 
Closes gh-18496
 2019-10-03 08:27:50 +01:00
Andy Wilkinson
2d08842ad7 Upgrade to Hibernate 5.4.6.Final 
Closes gh-18495
 2019-10-03 08:27:50 +01:00
Andy Wilkinson
a73f7829eb Upgrade to Johnzon Jsonb 1.2.0 
Closes gh-18493
 2019-10-03 08:11:21 +01:00
Andy Wilkinson
a907519ff5 Upgrade to Okhttp3 3.14.4 
Closes gh-18492
 2019-10-03 08:11:20 +01:00
Phillip Webb
be7a7bb2e9 Refine String to File conversion support 
Refine the conversion support so that file URLs are support without
reintroducing gh-12163.

Closes gh-16931
 2019-10-02 22:45:22 -07:00
Phillip Webb
680cdb471f Merge pull request #18490 from izeye 
* pr/18490:
  Polish

Closes gh-18490
 2019-10-02 22:15:18 -07:00
Johnny Lim
701bd0dd46 Polish 
See gh-18490
 2019-10-02 22:15:05 -07:00
Phillip Webb
4cfbe7fd3b Merge pull request #18472 from neiljpowell 
* pr/18472:
  Polish 'Support 'New Relic' eventType properties'
  Support 'New Relic' eventType properties

Closes gh-18472
 2019-10-02 22:13:17 -07:00
Phillip Webb
946202bd42 Polish 'Support 'New Relic' eventType properties' 
See gh-18472
 2019-10-02 22:12:53 -07:00
Neil Powell
e73ae62621 Support 'New Relic' eventType properties 
Update `NewRelicProperties` so that the event type sent with each
metric can be configured. An additional `boolean` property has
also been added if the previous behavior using the "meter-name"
is required.

NewRelic's own agents publish metrics to eventTypes aligned with broader
categories. To align with their recommendation the default behavior is
to publish metrics under a "SpringBootSample" category. When doing so,
additional context is provided by including "metricName" and
"metricType" attributes.

See gh-18472
 2019-10-02 22:08:14 -07:00