root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity
24,251 Commits 23 Branches 345 Tags 287 MiB
Commit Graph

24251 Commits

Author SHA1 Message Date
Andy Wilkinson 6a8d7218b6 Merge branch '2.2.x' 
Closes gh-19310
 2019-12-05 16:15:38 +00:00
Andy Wilkinson 9b0569cf81 Merge branch '2.1.x' into 2.2.x 
Closes gh-19309
 2019-12-05 16:15:15 +00:00
Andy Wilkinson bc53fe0344 Recommend mockito-inline for mocking and spying of CGLib proxies 
This reverts commit 52050c173c.

See gh-17817
Closes gh-19020
 2019-12-05 16:13:02 +00:00
Andy Wilkinson 4957994def Merge branch '2.2.x' 
Closes gh-19305
 2019-12-05 12:54:21 +00:00
Andy Wilkinson 3c0e7ccba6 Merge branch '2.1.x' into 2.2.x 
Closes gh-19304
 2019-12-05 12:53:36 +00:00
Andy Wilkinson 3e2b466c28 Merge pull request #19197 from bono007 
* gh-19197:
  Polish "Honour SSL key alias when using Netty"
  Honour SSL key alias when using Netty

Closes gh-19197
 2019-12-05 12:48:23 +00:00
Andy Wilkinson effdc8f359 Polish "Honour SSL key alias when using Netty" 
See gh-19197
 2019-12-05 12:48:13 +00:00
cbono eda7b7c3e6 Honour SSL key alias when using Netty 
See gh-19197
 2019-12-05 12:10:04 +00:00
Andy Wilkinson ae5ec4e41a Merge branch '2.2.x' 
Closes gh-19300
 2019-12-05 11:54:18 +00:00
Andy Wilkinson 758b80a0fe Merge branch '2.1.x' into 2.2.x 
Closes gh-19299
 2019-12-05 11:53:55 +00:00
Andy Wilkinson c6d4ff6ed5 Merge pull request #19290 from lyyprean 
* gh-19290:
  Remove redundant hasText check as query always has text

Closes gh-19290
 2019-12-05 11:52:47 +00:00
luoyuan c6a184474c Remove redundant hasText check as query always has text 
See gh-19290
 2019-12-05 11:51:35 +00:00
Andy Wilkinson 9f1e760054 Merge branch '2.2.x' 
Closes gh-19298
 2019-12-05 11:46:02 +00:00
Andy Wilkinson fec61b5b1c Merge pull request #19218 from tongluyang 
* gh-19218:
  Add missing closing parenthesis to the document

Closes gh-19218
 2019-12-05 11:45:43 +00:00
tongluyang 95aad5b556 Add missing closing parenthesis to the document 
See gh-19218
 2019-12-05 11:45:22 +00:00
Andy Wilkinson 4dc74793e1 Merge branch '2.2.x' 
Closes gh-19297
 2019-12-05 11:38:40 +00:00
Andy Wilkinson 305616713a Merge pull request #19292 from dreis2211 
* gh-19292:
  Upgrade to Testcontainers 1.12.4

Closes gh-19292
 2019-12-05 11:38:10 +00:00
dreis2211 f190affa6b Upgrade to Testcontainers 1.12.4 
See gh-19292
 2019-12-05 11:37:46 +00:00
Andy Wilkinson 10d593eeee Merge branch '2.2.x' 2019-12-05 11:34:44 +00:00
Andy Wilkinson 264d4f54ec Merge branch '2.1.x' into 2.2.x 2019-12-05 11:34:36 +00:00
Andy Wilkinson 38340522de Fix Asciidoc syntax 2019-12-05 11:33:58 +00:00
Andy Wilkinson a5f8975f4c Merge branch '2.2.x' 
Closes gh-19296
 2019-12-05 11:30:27 +00:00
Andy Wilkinson dc8edde0fc Merge pull request #19294 
* gh-19294:
  Reduce visibility of test methods

Closes gh-19294
See gh-19287
 2019-12-05 11:29:58 +00:00
dreis2211 ded476b5ec Reduce visibility of test methods 
See gh-19294
See gh-19287
 2019-12-05 11:29:17 +00:00
Andy Wilkinson ab4e1c465f Merge branch '2.2.x' 
See gh-19288
 2019-12-05 10:25:12 +00:00
Andy Wilkinson 47b47c28a0 Reduce visibility of the Gradle plugin's test methods 
See gh-19287
 2019-12-05 10:24:48 +00:00
Andy Wilkinson 9b88edbcf9 Merge branch '2.2.x' 
Closes gh-19153
 2019-12-05 10:07:00 +00:00
Andy Wilkinson a2451a4f29 Merge branch '2.1.x' into 2.2.x 
Closes gh-19152
 2019-12-05 10:06:32 +00:00
Andy Wilkinson b46bb726ca Clarify limitations of @PropertySource 
Closes gh-18900
 2019-12-05 10:05:50 +00:00
Phillip Webb 170fc7db65 Merge branch '2.2.x' 
Closes gh-19288
 2019-12-04 20:47:17 -08:00
Phillip Webb e9cbed8b3b Merge branch '2.1.x' into 2.2.x 
Closes gh-19287
 2019-12-04 20:46:40 -08:00
Phillip Webb 2fb75e5e67 Upgrade to spring-javaformat 0.0.17 
Closes gh-19286
 2019-12-04 20:39:55 -08:00
Phillip Webb f5f8e03252 Merge branch '2.2.x' 2019-12-04 20:27:18 -08:00
Phillip Webb 3d6307ffd2 Merge branch '2.1.x' into 2.2.x 2019-12-04 20:26:52 -08:00
Phillip Webb 5ffe8404c1 Fix checkstyle http:// error 2019-12-04 20:26:33 -08:00
Phillip Webb c969cb323b Merge branch '2.2.x' 
Closes gh-19284
 2019-12-04 20:12:20 -08:00
Phillip Webb d3c5527f6a Merge branch '2.1.x' into 2.2.x 
Closes gh-19283
 2019-12-04 20:10:27 -08:00
Phillip Webb 9f7999c626 Merge branch '2.2.x' 2019-12-04 18:34:49 -08:00
Phillip Webb 4c447f754a Update version number in oomph setup file 
Change version from 2.2.x to 2.3.x.
 2019-12-04 18:33:57 -08:00
Phillip Webb f4752430d4 Merge branch '2.1.x' into 2.2.x 2019-12-04 18:20:09 -08:00
Phillip Webb 0b5ce952ba Use Eclipse m2e 1.14.0 
Update our Oomph setup to use m2e 1.14.0 from their milestone
update site. Unfortunately we need to use the milestone since
the fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=548652
has not yet made it into a stable m2e release.

Closes gh-19280
 2019-12-04 18:18:44 -08:00
Phillip Webb d29444baf1 No longer hide nested projects 
Change the Oomph setup to no longer hide nested Maven projects
so that https://bugs.eclipse.org/bugs/show_bug.cgi?id=553789
doesn't get triggered.

See gh-19280
 2019-12-04 18:13:15 -08:00
Phillip Webb 818d55365b Upgrade to Eclipse 2019.9 
Upgrade our Oomph setup to use Eclipse 2019.9

See gh-19280
 2019-12-04 18:13:11 -08:00
Madhura Bhave 0a2387ed0b Merge branch '2.2.x' 
Closes gh-19279
 2019-12-04 14:42:34 -08:00
Madhura Bhave 2c4a1f1c15 Display @Validated constructor bound properties in configprops endpoint 
Fixes gh-19219
 2019-12-04 14:41:34 -08:00
Andy Wilkinson d3a30dc28f Upgrade to Maven Enforcer Plugin 3.0.0-M3 
Closes gh-19276
 2019-12-04 20:11:01 +00:00
Andy Wilkinson edb1f9e03a Upgrade to Webjars Locator Core 0.43 
Closes gh-19275
 2019-12-04 20:11:01 +00:00
Andy Wilkinson 896a048d9e Upgrade to Spring Cloud Connectors 2.0.7.RELEASE 
Closes gh-19274
 2019-12-04 20:11:01 +00:00
Andy Wilkinson d8ead5bcf7 Upgrade to Neo4j Ogm 3.2.3 
Closes gh-19273
 2019-12-04 20:11:01 +00:00
Andy Wilkinson 08db520566 Upgrade to Jetty El 8.5.49 
Closes gh-19272
 2019-12-04 20:11:01 +00:00