8209980ca0
Merge branch '2.7.x'
3 years ago
027093d852
Use a templated source file for SpringBootVersion
...
Closes gh-29670
3 years ago
829ff4d03f
Merge branch '2.7.x'
3 years ago
2afa02c856
Fix missing test slice configuration
...
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.
See gh-29873
3 years ago
303979fb65
Merge branch '2.7.x'
3 years ago
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
3 years ago
f4b849ec95
Merge branch '2.7.x'
3 years ago
26512f8ac6
Merge branch '2.6.x' into 2.7.x
3 years ago
5b4ec32645
Merge branch '2.5.x' into 2.6.x
3 years ago
c86b1330cf
Update copyright year of changed files
3 years ago
79e5d3a2d0
Merge branch '2.7.x' into main
3 years ago
f80490bafb
Precompute Spring Boot version at build time
...
Closes gh-29670
3 years ago
3b5e7ee0a8
Merge branch '2.7.x'
3 years ago
7e8d499333
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29690
3 years ago
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
3 years ago
52d9ba58d8
Move appendix subsections under appendix section
...
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.
See gh-29667
3 years ago
977a0a8356
Merge branch '2.7.x'
3 years ago
2fec7b8562
Only use Kotlin 1.6 API and language versions in docs project
...
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.
Closes gh-29654
3 years ago
a6b7ae2110
Merge branch '2.7.x'
3 years ago
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
3 years ago
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
3 years ago
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
3 years ago
50047e6d8c
Merge branch '2.7.x'
3 years ago
6c74e24147
Update copyright year of changed files
3 years ago
8ed5d15cd3
Merge branch '2.7.x'
3 years ago
d33d92dfce
Polish KotlinConventions
3 years ago
f8c2bff825
Use Kotlin 1.6 for API and language version
...
Closes gh-29654
3 years ago
a726210afc
Merge branch '2.7.x'
3 years ago
546cad06db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29635
3 years ago
c01cee18b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29634
3 years ago
79fc77fade
Upgrade to spring-javaformat 0.0.31
...
Closes gh-29633
3 years ago
f2ac7d10ef
Merge branch '2.7.x'
3 years ago
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
3 years ago
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
3 years ago
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
3 years ago
b8983cef59
Merge branch '2.7.x'
3 years ago
cd426fd21e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29547
3 years ago
75c3bff765
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29546
3 years ago
761bed6c48
Upgrade buildSrc to Spring Framework 5.3.15
...
Closes gh-29545
3 years ago
fb83e6930d
Merge branch '2.7.x'
3 years ago
b31e9d6b4a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29492
3 years ago
1f61c36f7a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29491
3 years ago
66428527e0
Minimize tasks run in ConventionsPluginTests
...
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.
Closes gh-29490
3 years ago
12cd97a20c
Reinstate support for Thymeleaf
3 years ago
119b920969
Merge branch '2.7.x'
3 years ago
f3d99f9ccc
Merge branch '2.6.x' into 2.7.x
3 years ago
01c19ef444
Merge branch '2.5.x' into 2.6.x
3 years ago
a0537888f5
Upgrade build to Log4j 2.17.1
3 years ago
3ef03cddb9
Merge branch '2.7.x'
3 years ago
9c868751d6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29199
3 years ago
f54ea67ed6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29198
3 years ago
7a87d18b12
Update copyrights to 2022
...
See gh-29195
3 years ago
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c938d58f32c
3 years ago
f0677a119c
Merge branch '2.7.x'
3 years ago
de808834f5
Auto-configure Spring GraphQL base infrastructure
...
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:
* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
controllers programming model
This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.
See gh-29140
3 years ago
34f96514ad
Fix link to source code in snapshot documentation
...
Fixes gh-28856
3 years ago
e994ee3be5
Merge branch '2.7.x'
...
See gh-28986
3 years ago
821f7086d9
Merge branch '2.6.x' into 2.7.x
...
See gh-28985
3 years ago
e048562c34
Merge branch '2.5.x' into 2.6.x
...
See gh-28984
3 years ago
21e54a595e
Upgrade Build to Log4j 2.17.0
...
See gh-28983
3 years ago
003fb229fd
Merge branch '2.7.x'
3 years ago
f3bcbca841
Update copyright year of changed files
3 years ago
07243539bd
Remove unused import
...
See gh-29029
3 years ago
caf49783d4
Merge branch '2.7.x'
3 years ago
a773af0387
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29073
3 years ago
9e6709eda0
Enable caching for system tests in CI
...
Setting the `systemTest` Gradle task output as never up-to-date ensures
that all system tests are executed each time they are run in CI. The
`--rerun-tasks` Gradle option that was used previously had the same
effect but also disabled build caching.
Closes gh-29029
3 years ago
1c72330bd9
Upgrade to Log4j2 2.16.0
...
Closes gh-28986
3 years ago
894eb83e66
Upgrade to Log4j2 2.16.0
...
Closes gh-28985
3 years ago
15ade0b5d3
Upgrade to Log4j2 2.16.0
...
Closes gh-28984
3 years ago
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
3 years ago
9f07bb50b2
Merge branch '2.7.x'
3 years ago
0c1a8c2c5e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29009
3 years ago
91593eeea3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29008
3 years ago
43f3d0dea0
Upgrade Build to Log4j 2.15.0
...
See gh-29006
3 years ago
91faec3917
Merge branch '2.7.x'
3 years ago
51e0fc4b6b
Merge branch '2.6.x' into 2.7.x
...
See gh-28879
3 years ago
f0f0aa5c46
Merge branch '2.5.x' into 2.6.x
...
See gh-28878
3 years ago
8322dda8cc
Fix variant selection in spring-boot-maven-plugin
...
See gh-28877
3 years ago
95025d442f
Merge branch '2.7.x'
3 years ago
bad05a7860
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28879
3 years ago
c7c7592899
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28878
3 years ago
25bdc097a0
Make poms of all dependencies available in int test repo
...
Closes gh-28877
3 years ago
87a5b72aa5
Merge branch '2.7.x'
3 years ago
f3957b7639
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28865
3 years ago
9d4375bc12
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28864
3 years ago
572bd6ca5c
Upgrade to test-retry-gradle-plugin 1.3.1
...
Closes gh-28863
3 years ago
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
3 years ago
8bf2ffd93c
Drop support for Jersey until jersey-spring6 is available
...
Closes gh-28808
3 years ago
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
3 years ago
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
3 years ago
75c117a33f
Prepare 2.7.x branch
3 years ago
354a18c9a6
Prepare 2.6.x branch
3 years ago
beb68671bb
Update copyright year of changed files
3 years ago
381c094c41
Merge branch '2.5.x'
3 years ago
8f0e12dc34
Revert accidentally committed changes
...
This partially reverts commit c083e0b049
3 years ago
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
3 years ago
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
3 years ago
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
3 years ago
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
3 years ago
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
3 years ago
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
3 years ago
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
3 years ago
51dc02e37b
Merge branch '2.5.x'
...
See gh-28485
3 years ago
28d323ee3a
Merge branch '2.4.x' into 2.5.x
...
See gh-28484
3 years ago
b9e3660833
Revert running tests in parallel
...
See gh-19876
3 years ago
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
3 years ago
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
3 years ago
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
3 years ago
66aa713b85
Merge branch '2.5.x'
3 years ago
467e063d4b
Merge branch '2.4.x' into 2.5.x
3 years ago
8e704aab48
Restore 'javax.xml.bind:jaxb-api' exclusion
...
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.
The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.
See gh-28332
3 years ago
e95b0b5257
Polish
3 years ago
37a7144426
Merge branch '2.5.x'
...
Closes gh-28343
3 years ago
1a30c660f3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28342
3 years ago
adb9226dec
Prohibit org.apache.geronimo.specs dependencies in our starters
...
Closes gh-28338
3 years ago
2d837a6eae
Merge branch '2.5.x'
...
Closes gh-28337
3 years ago
3800f060b5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28336
3 years ago
2fb8c8d27e
Check starters for unnecessary exclusions
...
Closes gh-28332
3 years ago
191b50241d
Merge branch '2.5.x'
...
Closes gh-28331
3 years ago
d3037103fe
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28330
3 years ago
9f13941c2f
Prohibit org.jboss.spec.* dependencies
...
Closes gh-28329
3 years ago
2034ad4827
Merge branch '2.5.x'
3 years ago
02b577390f
Merge branch '2.4.x' into 2.5.x
3 years ago
0561992c2a
Update copyright year of changed files
3 years ago
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
3 years ago
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
3 years ago
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
3 years ago
0b58d4858d
Merge branch '2.5.x'
...
Closes gh-28200
3 years ago
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
3 years ago
8c3820f87e
Fix up-to-date checking of syncAppSource tasks
...
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.
This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.
Closes gh-28197
3 years ago
ea68672594
Merge branch '2.5.x'
...
Closes gh-28153
3 years ago
9e484e2cdc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28152
3 years ago
3824512357
Tighten up build's task interdependencies
...
Closes gh-28103
3 years ago
cf0fcafd13
Polish
...
See gh-27940
3 years ago
7c034c33e2
Merge branch '2.5.x'
...
Closes gh-27967
3 years ago
f530819d68
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27966
3 years ago
273600bcdd
Retain distinction between compile and runtime deps of optional deps
...
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.
This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.
The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.
Closes gh-27965
3 years ago
69d4e273d3
Merge branch '2.5.x'
...
Closes gh-27787
3 years ago
3566e5881b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27786
3 years ago
9f402f0428
Use snapshot rather than libs-snapshot when generating effective bom
...
Closes gh-27785
3 years ago
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
3 years ago
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
3 years ago
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
3 years ago
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
3 years ago
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
3 years ago
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
3 years ago
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
3 years ago
07da144826
Use 2012 for copyright beginning year
...
See gh-27734
3 years ago
44884cc495
Merge branch '2.5.x'
...
Closes gh-27752
3 years ago
10ceb504ae
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27751
3 years ago
32c184e31c
Revert changes made to work around JDK-8156584
...
Closes gh-26848
3 years ago
af13125796
Merge branch '2.5.x'
...
Closes gh-27498
3 years ago
9127588082
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27497
3 years ago
ea6cb74ccf
Ignore Spring Boot when finding dependency upgrades
...
Closes gh-27447
3 years ago
a5ec7560f5
Merge branch '2.5.x'
...
Closes gh-27314
3 years ago
e4978f604c
Fix JDK 16 pipeline
...
See gh-27310
3 years ago
9ccd6a6f2f
Merge branch '2.5.x'
...
Closes gh-27307
3 years ago
705feeed6a
Polish "Allow additional JVM args when running tests via toolchain"
...
See gh-27089
3 years ago
01b0156fed
Allow additional JVM args when running tests via toolchain
...
See gh-27089
3 years ago
18c7c0af22
Add Paketo image building system tests
...
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.
The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.
Closes gh-25824
3 years ago
fcf7240f3c
Merge branch '2.5.x'
...
See gh-27047
3 years ago
f7140d0401
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
3 years ago
316d2cce89
Don't offer upgrade for version that is already aligned
...
See gh-27044
3 years ago
6102f10639
Merge branch '2.5.x'
3 years ago
2c518f1dff
Merge branch '2.4.x' into 2.5.x
3 years ago
a76e5c043e
Update copyright year of changed files
3 years ago
aa3d72cb05
Merge branch '2.5.x'
...
See gh-27047
3 years ago
5139c79c4f
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
3 years ago
4d694ddaa8
Fix bom plugin management versions
...
See gh-27044
3 years ago
5d6a612b4b
Merge branch '2.5.x'
...
Closes gh-27047
3 years ago
ec2a7b9a5b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27045
3 years ago
363de4cfa5
Add dependency lock and constraint version alignment to Bomr
...
Closes gh-27044
3 years ago
06778abb61
Merge branch '2.5.x'
...
See gh-26934
3 years ago
577c58b798
Merge branch '2.4.x' into 2.5.x
...
See gh-26933
3 years ago
ac8c6a6fb7
Tune config of source and target compatilility with toolchain
...
See gh-26932
3 years ago
2106114f64
Merge branch '2.5.x'
...
Closes gh-26934
3 years ago
560d272db3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26933
3 years ago
6e43dd879b
Allow Eclipse to properly detect source and target compatibility
...
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].
This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.
Closes gh-26932
[1] https://github.com/eclipse/buildship/issues/978
3 years ago
0f52bbc560
Stop using ConfigureUtil in BomExtension
...
While we're building with Gradle 6.9 at the moment and ConfigureUtil
has only been deprecated in Gradle 7.1, it doesn't do any harm to
stop using it now.
Closes gh-26928
3 years ago
28abcf88a0
Upgrade to spring-asciidoctor-backends 0.0.2
...
Closes gh-26846
3 years ago
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
3 years ago
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
3 years ago
f798f26596
Merge branch '2.4.x'
3 years ago
6424e3de12
Merge branch '2.4.x'
...
Closes gh-26671
4 years ago
14f578ed80
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26670
4 years ago
39e3746cf6
Force Eclipse to use JavaSE-1.8 runtime
...
Add `EclipseConventions` to force the JavaSE-1.8 runtime to be applied
to the imported projects.
Closes gh-26669
4 years ago
60a8fae65c
Upgrade to spring-asciidoctor-backends 0.0.1
...
Closes gh-26293
4 years ago
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
4 years ago
34b288e5fe
Add prefix to appendix property anchor links
...
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.
Closes gh-26375
4 years ago
a6dd97e40d
Polish
...
See gh-26576
4 years ago
763e58e392
Merge branch '2.4.x'
...
Closes gh-26576
4 years ago
ad5ba2e414
Compile Kotlin code will all warnings treated as errors
...
Closes gh-26083
4 years ago
aaceb9565c
Upgrade to Kotlin 1.5.0
...
Closes gh-26553
4 years ago
f7d28567c0
Merge branch '2.4.x'
...
Closes gh-26520
4 years ago
6179b99710
Remove add-opens workaround in ToolchainPlugin
...
See gh-26465
4 years ago
87d8aedd3c
Use spring-pdf backend for PDF generation
...
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.
Closes gh-26373
4 years ago
8d2fa26a99
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26394
4 years ago
a5cb9540ca
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26393
4 years ago
f17af829ee
Merge branch '2.4.x'
...
Closes gh-26354
4 years ago
75bb50bd02
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26353
4 years ago
Andy Wilkinson
Moritz Halbritter
Phillip Webb
Scott Frederick
Moritz Halbritter
Stephane Nicoll
dreis2211
Brian Clozel
Madhura Bhave
Arun Suresh
izeye