Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,784 Commits 23 Branches 0 Tags
d058af5be21fe062a67c78006184c37bb6aef91d
Commit Graph

34784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
d058af5be2 Upgrade to Spring AMQP 2.4.0 
Closes gh-28518
 2021-11-15 19:58:29 +01:00
Scott Frederick
8903c69b19 Avoid exposing time-related task metrics 
Fixes gh-28535
 2021-11-15 12:24:50 -06:00
Scott Frederick
d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique 
Fixes gh-28536
 2021-11-15 12:23:25 -06:00
Andy Wilkinson
a1e7375fc0 Polish 2021-11-15 13:03:10 +00:00
Andy Wilkinson
2d7e0314f3 Merge branch '2.5.x' 
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
 2021-11-15 12:51:43 +00:00
Andy Wilkinson
0aae9c26da Test our Gradle plugin against Gradle 7.3 
Closes gh-28679
 2021-11-15 12:47:51 +00:00
Andy Wilkinson
b1ff60c728 Merge branch '2.5.x' 
Closes gh-28681
 2021-11-15 12:09:06 +00:00
Andy Wilkinson
4cfbc0db36 Merge branch '2.4.x' into 2.5.x 
Closes gh-28680
 2021-11-15 12:08:49 +00:00
Andy Wilkinson
2e5f80edaa Merge pull request #28677 from polarbear567 
* gh-28677:
  Fix @deprecated and @see in Archive's javadoc

Closes gh-28677
 2021-11-15 12:07:49 +00:00
Leo Li
9de9983e25 Fix @deprecated and @see in Archive's javadoc 
See gh-28677
 2021-11-15 12:07:22 +00:00
Filip Hrisafov
d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available 
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
 2021-11-15 09:59:20 +01:00
Stephane Nicoll
6e06e69bba Merge branch '2.5.x' 
Closes gh-28673
 2021-11-14 08:25:01 +01:00
Stephane Nicoll
4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll
9d02d9a07d Merge pull request #28532 from jzheaux 
* pr/28532:
  Update copyright year of changed file
  Harmonize @ConditionalOnMissingBean definition

Closes gh-28532
 2021-11-14 08:24:36 +01:00
Stephane Nicoll
d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00
Josh Cummings
d817029575 Harmonize @ConditionalOnMissingBean definition 
See gh-28532
 2021-11-14 08:19:43 +01:00
Stephane Nicoll
854d8723cc Upgrade to Spring Data 2021.1.0 
Closes gh-28517
 2021-11-13 16:22:40 +01:00
Stephane Nicoll
818abdc70d Upgrade to Spring HATEOAS 1.4.0 
Closes gh-28610
 2021-11-13 16:22:05 +01:00
Stephane Nicoll
113a7bd525 Upgrade to Neo4j Java Driver 4.3.6 
Closes gh-28667
 2021-11-13 16:21:43 +01:00
Stephane Nicoll
83151a3a72 Upgrade to MongoDB 4.4.0 
Closes gh-28666
 2021-11-13 16:21:42 +01:00
Stephane Nicoll
7f3cff062d Upgrade to Elasticsearch 7.15.2 
Closes gh-28665
 2021-11-13 16:21:40 +01:00
Stephane Nicoll
e638ded7e9 Upgrade to Couchbase Client 3.2.3 
Closes gh-28664
 2021-11-13 16:21:39 +01:00
Stephane Nicoll
fd57dbf0ed Merge branch '2.5.x' 2021-11-13 16:18:55 +01:00
Stephane Nicoll
8c90188661 Merge branch '2.4.x' into 2.5.x 2021-11-13 16:18:39 +01:00
Stephane Nicoll
e396aa310f Upgrade to Spring Data 2021.0.7 
Closes gh-28512
 2021-11-13 16:17:57 +01:00
Stephane Nicoll
52098229c0 Upgrade to Spring HATEOAS 1.3.6 
Closes gh-28609
 2021-11-13 16:17:35 +01:00
Stephane Nicoll
e7d62ffb01 Upgrade to Spring Data 2020.0.15 
Closes gh-28508
 2021-11-13 16:16:51 +01:00
Stephane Nicoll
f3e2a40424 Upgrade to Spring HATEOAS 1.2.11 
Closes gh-28608
 2021-11-13 16:16:17 +01:00
Andy Wilkinson
2a342ef416 Merge branch '2.5.x' 
Closes gh-28662
 2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson
3ba8184cb1 Merge branch '2.5.x' 
Closes gh-28660
 2021-11-12 20:04:09 +00:00
Andy Wilkinson
ef02db9ed1 Merge branch '2.4.x' into 2.5.x 
Closes gh-28659
 2021-11-12 20:03:53 +00:00
Andy Wilkinson
0889cdd516 Add dependency management for Glassfish JSTL 
To be used in place of javax.servlet:jstl

Closes gh-28657
 2021-11-12 20:03:15 +00:00
Andy Wilkinson
c80283b85f Merge branch '2.5.x' 
Closes gh-28653
 2021-11-12 13:05:42 +00:00
Andy Wilkinson
92fd3b79a5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28652
 2021-11-12 13:05:14 +00:00
Andy Wilkinson
08aac25c00 Limit logging produced by spring-boot-loader-tests's intTest task 
Closes gh-28651
 2021-11-12 13:04:10 +00:00
Stephane Nicoll
303dd4cfe0 Upgrade to Micrometer 1.8.0 
Closes gh-28516
 2021-11-12 10:14:04 +01:00
Andy Wilkinson
5f1103f381 Add missing @Deprecated annotation 
Closes gh-28602
 2021-11-11 12:03:33 +00:00
Andy Wilkinson
925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson
3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson
6fa523ed6f Start building against Spring HATEOAS 1.4.0 snapshots 
See gh-28610
 2021-11-11 10:01:37 +00:00
Andy Wilkinson
791453bba9 Merge branch '2.5.x' 2021-11-11 10:01:14 +00:00
Andy Wilkinson
1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots 
See gh-28609
 2021-11-11 10:00:37 +00:00
Andy Wilkinson
27cd3a1e36 Merge branch '2.4.x' into 2.5.x 2021-11-11 10:00:22 +00:00
Andy Wilkinson
ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots 
See gh-28608
 2021-11-11 09:59:05 +00:00
Andy Wilkinson
7a24ee88ae Merge branch '2.5.x' 
Closes gh-28607
 2021-11-11 09:55:42 +00:00
Andy Wilkinson
23197c34c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28606
 2021-11-11 09:55:21 +00:00
Andy Wilkinson
c018788846 Test JTA auto-configured from JNDI 
Closes gh-28594
 2021-11-11 09:54:50 +00:00
Stephane Nicoll
40e09413dd Merge branch '2.5.x' 2021-11-11 10:00:37 +01:00