root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
29,499 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

29499 Commits

Author SHA1 Message Date
Stephane Nicoll b230b41e07 Merge branch '2.3.x' 2020-10-29 18:58:13 +01:00
Spring Buildmaster a2d87678df Next development version (v2.3.6.BUILD-SNAPSHOT) 2020-10-29 17:40:17 +00:00
Andy Wilkinson 1d4a45cf8a Add dependency management for jOOQ's new jooq-kotlin module 
Closes gh-23964
 2020-10-29 16:35:37 +00:00
Phillip Webb fe28ad88db Merge branch '2.3.x' 2020-10-29 09:17:42 -07:00
Phillip Webb 33d66b7f82 Fix to spring-doc-resources version 
See gh-23824
 2020-10-29 09:16:37 -07:00
Andy Wilkinson c22e655848 Move spring.resources.* properties to spring.web.resources.* 
Closes gh-23917
 2020-10-29 16:08:50 +00:00
Phillip Webb 929d8fcd3c Update copyright year of changed files 2020-10-29 09:08:13 -07:00
Phillip Webb a41ff4dfab Merge branch '2.3.x' 2020-10-29 09:07:57 -07:00
Phillip Webb b0c2687aa9 Update copyright year of changed files 2020-10-29 09:07:42 -07:00
Phillip Webb 98dbfd572f Merge branch '2.3.x' 
Closes gh-23971
 2020-10-29 09:06:59 -07:00
Phillip Webb 2992f40222 Upgrade to spring-doc-resources 0.2.3.RELEASE 
Closes gh-23824
 2020-10-29 09:06:23 -07:00
Andy Wilkinson 5642dc6d13 Merge branch '2.3.x' 
Closes gh-23970
 2020-10-29 15:31:59 +00:00
Andy Wilkinson 70d9602b3f Merge branch '2.2.x' into 2.3.x 
Closes gh-23969
 2020-10-29 15:31:12 +00:00
Andy Wilkinson e7eb7739dc Use overriding rather than overridden getter methods in config prop AP 
Fixes gh-23966
 2020-10-29 15:30:46 +00:00
Stephane Nicoll f0558bb048 Merge branch '2.3.x' 2020-10-29 16:27:13 +01:00
Stephane Nicoll eb77a20ea1 Merge branch '2.2.x' into 2.3.x 2020-10-29 16:26:40 +01:00
Spring Buildmaster 79a833539b Next development version (v2.2.12.BUILD-SNAPSHOT) 2020-10-29 13:47:25 +00:00
Andy Wilkinson a8705d19e5 Upgrade to Flyway 7.1.1 
Closes gh-23932
 2020-10-29 13:04:00 +00:00
Stephane Nicoll cc3c898dfe Upgrade to github-changelog-generator 0.0.4 
Closes gh-23965
 2020-10-29 13:36:39 +01:00
Stephane Nicoll 3b899ee326 Merge branch '2.1.x' into 2.2.x 2020-10-29 13:35:50 +01:00
Spring Buildmaster 625a0c99cb Next development version (v2.1.19.BUILD-SNAPSHOT) 2020-10-29 11:15:37 +00:00
Stephane Nicoll 7b4d26138d Merge branch '2.3.x' 2020-10-29 11:24:05 +01:00
Stephane Nicoll 2520ab4aa1 Merge branch '2.2.x' into 2.3.x 2020-10-29 11:22:11 +01:00
Stephane Nicoll 7de2711396 Merge branch '2.1.x' into 2.2.x 2020-10-29 11:21:16 +01:00
Andy Wilkinson ee7a686e24 Merge pull request #23958 from evgeniycheban 
* gh-23958:
  Polish "Add liquibase driver class name property"
  Add liquibase driver class name property

Closes gh-23958
 2020-10-29 10:07:12 +00:00
Andy Wilkinson 2db8e7eebe Polish "Add liquibase driver class name property" 
See gh-23958
 2020-10-29 10:06:43 +00:00
Stephane Nicoll ec57251c55 Configure release script to use .RELEASE suffix 2020-10-29 11:01:32 +01:00
Evgeniy Cheban 8a9b31aa69 Add liquibase driver class name property 
See gh-23958
 2020-10-29 09:11:41 +00:00
Andy Wilkinson 97fbef60d3 Merge branch '2.3.x' 2020-10-29 09:07:26 +00:00
Andy Wilkinson dcb42c36f9 Ensure that additional metadata is available to annotation processor 
Fixes gh-23934
 2020-10-29 09:07:05 +00:00
Stephane Nicoll 24fe2c089e Merge branch '2.3.x' 2020-10-29 09:34:22 +01:00
Stephane Nicoll 4f92574483 Merge branch '2.2.x' into 2.3.x 2020-10-29 09:34:07 +01:00
Stephane Nicoll 770b5f4528 Merge branch '2.1.x' into 2.2.x 
See gh-23962
 2020-10-29 09:33:37 +01:00
Stephane Nicoll 6c0fc7f195 Workaround broken function in concourse scripts 
See spring-io/concourse-java-scripts#11
 2020-10-29 09:32:50 +01:00
Stephane Nicoll dc54394c03 Upgrade to Spring Batch 4.3.0 
Closes gh-23963
 2020-10-29 09:06:38 +01:00
Stephane Nicoll e962714dd3 Upgrade to Spring Session 2020.0.0 
Closes gh-23788
 2020-10-29 09:06:08 +01:00
Stephane Nicoll 6f9434ccc4 Upgrade to Spring Integration 5.4.0 
Closes gh-23781
 2020-10-29 09:05:23 +01:00
Stephane Nicoll 1f02623ae1 Merge branch '2.3.x' 2020-10-29 08:30:30 +01:00
Stephane Nicoll 165b132346 Merge branch '2.2.x' into 2.3.x 2020-10-29 08:30:11 +01:00
Stephane Nicoll a8db6a8a83 Merge branch '2.1.x' into 2.2.x 
See gh-23962
 2020-10-29 08:28:25 +01:00
Stephane Nicoll 3ebd247613 Workaround broken function in concourse scripts 
See spring-io/concourse-java-scripts#11
 2020-10-29 08:23:55 +01:00
Phillip Webb 74e06e8e6a Refine MetadataCollector logic 
Update `MetadataCollector` merge logic so that previous items are no
longer added if the current round contains a property of the same name.

Fixes gh-23916
 2020-10-28 21:59:06 -07:00
Phillip Webb 23e5fd798c Merge branch '2.3.x' 
Closes gh-23960
 2020-10-28 21:18:42 -07:00
Phillip Webb b86dcbec72 Merge branch '2.2.x' into 2.3.x 
Closes gh-23959
 2020-10-28 21:18:17 -07:00
Phillip Webb cf09451ffb Retain inner-class data on incremental compile 
Ensure that metadata sourced from inner-types is not deleted when
performing an incremental compile. Prior to this commit, the source
type was searched using the `Outer$Inner` format. This is not supported
`Elements.getTypeElement` so we now convert the names to `Outer.Inner`.

Closes gh-10886
 2020-10-28 21:13:08 -07:00
Phillip Webb dac051de4d Merge branch '2.3.x' 
Closes gh-23948
 2020-10-28 19:37:50 -07:00
Phillip Webb 7f4a7c21d2 Merge branch '2.2.x' into 2.3.x 
Closes gh-23939
 2020-10-28 19:37:32 -07:00
Phillip Webb 9b4ccf4ac6 Upgrade CI to Java 15.0.1_9 
Closes gh-23953
 2020-10-28 19:36:33 -07:00
Phillip Webb b6286dc3d0 Merge branch '2.3.x' 
Closes gh-23945
 2020-10-28 19:34:26 -07:00
Phillip Webb ec032b372e Merge branch '2.2.x' into 2.3.x 
Closes gh-23941
 2020-10-28 19:33:51 -07:00