root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
20,751 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

20751 Commits

Author SHA1 Message Date
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Phillip Webb 6d01bc915b Make intermediate classes of public classes public 
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.

Closes gh-17337
 2019-06-28 12:18:07 -07:00
Andy Wilkinson 91786bc712 Merge branch '2.0.x' into 2.1.x 
Closes gh-17334
 2019-06-27 11:39:17 +01:00
Andy Wilkinson 256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson 1ee8c53b90 Upgrade to spring-javaformat 0.0.14 
Closes gh-17331
 2019-06-27 11:10:13 +01:00
Andy Wilkinson 096951d531 Merge branch '2.0.x' into 2.1.x 
Closes gh-17305
 2019-06-27 10:41:37 +01:00
Andy Wilkinson 57bc03ac57 Merge branch '1.5.x' into 2.0.x 2019-06-27 10:22:02 +01:00
Madhura Bhave 74912ee126 Remove setting.xml from .gitignore 
Closes gh-17309
 2019-06-26 11:50:51 -07:00
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x 
Closes gh-17320
 2019-06-26 17:39:13 +01:00
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson 72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression 
Closes gh-15200
 2019-06-26 17:31:00 +01:00
Andy Wilkinson 0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it 
Closes gh-17317
 2019-06-26 17:31:00 +01:00
Madhura Bhave 26b61e6f8d Fix deprecation warnings in pipeline.yml 
Closes gh-17310
 2019-06-25 17:48:57 -07:00
Phillip Webb 02e705c8e4 Relax nohttp requirement for service.wsdl 
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
 2019-06-25 11:17:27 -07:00
Andy Wilkinson 7e4111954f Merge branch '2.0.x' into 2.1.x 
Closes gh-17305
 2019-06-25 16:25:46 +01:00
Andy Wilkinson 23e119c239 Merge branch '1.5.x' into 2.0.x 2019-06-25 16:25:24 +01:00
Andy Wilkinson 1ee7b80162 Update the Oomph setup for Eclipse 2019-06 
Closes gh-15200
 2019-06-25 16:22:53 +01:00
Stephane Nicoll 374e02cac8 Simplify HibernateJpaAutoConfiguration classes check 
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17288
 2019-06-21 15:26:07 +02:00
Stephane Nicoll 86ace26049 Fix broken link to Spring Integration reference guide 
Closes gh-17279
 2019-06-21 09:09:01 +02:00
Andy Wilkinson a5ae1de706 Fix spring-boot-loader's tests on Windows 
Closes gh-17275
 2019-06-20 11:08:35 +01:00
Stephane Nicoll 7e5ca6d280 Merge branch '2.0.x' into 2.1.x 
Closes gh-17268
 2019-06-19 15:30:13 +02:00
Stephane Nicoll 11dee3c0d8 Merge branch '1.5.x' into 2.0.x 2019-06-19 15:27:49 +02:00
Stephane Nicoll 29de792148 Merge pull request #17068 from ielatif 
* pr/17068:
  Fix javadoc of management server port

Closes gh-17068
 2019-06-19 15:19:34 +02:00
Issam El-atif fca97ff86c Fix javadoc of management server port 
See gh-17068
 2019-06-19 15:15:04 +02:00
Phillip Webb 6e5ba8077a Fix sync-to-maven-central script 2019-06-18 21:04:54 -07:00
Phillip Webb 11b8e7c2de Don't exit script on error 
Update CI scripts so that command failures do not cause an immediate
exit. Prior to this commit, some of our looping logic would never run
because the entire script would exit.
 2019-06-18 20:41:26 -07:00
Spring Buildmaster fb90803dbf Next development version (v2.1.7.BUILD-SNAPSHOT) 2019-06-19 00:55:05 +00:00
Phillip Webb ffbb23bc6d Always use credentials in forward merge script 
Closes gh-17257
 2019-06-18 15:08:09 -07:00
Phillip Webb b0415c4044 Don't ignore images on CI build 
Closes gh-17255
 2019-06-18 14:49:16 -07:00
Phillip Webb 718c1d7204 Upgrade Java 12 version in CI image 
Closes gh-17246
 2019-06-18 10:32:57 -07:00
Phillip Webb 064240266f Upgrade Java 11 version in CI image 
Closes gh-17244
 2019-06-18 10:31:14 -07:00
Phillip Webb 3869da88d4 Upgrade Java 8 version in CI image 
Closes gh-17245
 2019-06-18 10:29:19 -07:00
Phillip Webb de037f55dc Fix detect JDK CI script 2019-06-18 09:50:05 -07:00
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final 
Closes gh-17235
 2019-06-17 19:42:33 -07:00
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry 
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
 2019-06-17 15:48:14 -07:00
Phillip Webb 5e3438f095 Merge pull request #16535 from ayudovin 
* pr/16535:
  Polish "Fix connection timeout configuration for Netty"
  Fix connection timeout configuration for Netty
  Chain predicates in PropertyMapper when methods

Closes gh-16535
 2019-06-17 11:43:07 -07:00
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty" 
See gh-16535
 2019-06-17 11:26:36 -07:00
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty 
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
 2019-06-17 11:24:35 -07:00
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods 
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
 2019-06-17 11:21:56 -07:00
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5 
Closes gh-17222
 2019-06-17 16:15:44 +01:00
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework 
Fixes gh-17062
 2019-06-17 16:00:39 +01:00
Andy Wilkinson ade4f32f96 Merge branch '2.0.x' into 2.1.x 2019-06-17 14:26:01 +01:00
Andy Wilkinson 5011338714 Merge branch '1.5.x' into 2.0.x 2019-06-17 14:23:27 +01:00
Andy Wilkinson e8e9ec93bb Merge branch '2.0.x' into 2.1.x 2019-06-17 14:22:26 +01:00
Andy Wilkinson a51d31b4d5 Merge branch '1.5.x' into 2.0.x 2019-06-17 14:22:06 +01:00
Andy Wilkinson 844873c18a Starting building against Spring Framework 4.3.25 snaphots 
See gh-17221
 2019-06-17 14:15:58 +01:00
Andy Wilkinson ceace66a28 Merge pull request #16485 from lorenzodee 
* gh-16485:
  Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
  Honour base path from @WebAppConfiguration in @WebMvcTest

Closes gh-16485
 2019-06-17 13:54:57 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest" 
See gh-16485
 2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest 
See gh-16485
 2019-06-17 13:37:55 +01:00