Stephane Nicoll
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll
0c1a8c2c5e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29009
2021-12-14 09:50:41 +01:00
Stephane Nicoll
91593eeea3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29008
2021-12-14 09:50:30 +01:00
Arun Suresh
43f3d0dea0
Upgrade Build to Log4j 2.15.0
...
See gh-29006
2021-12-14 09:42:46 +01:00
Andy Wilkinson
51e0fc4b6b
Merge branch '2.6.x' into 2.7.x
...
See gh-28879
2021-12-01 12:17:10 +00:00
Andy Wilkinson
f0f0aa5c46
Merge branch '2.5.x' into 2.6.x
...
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson
8322dda8cc
Fix variant selection in spring-boot-maven-plugin
...
See gh-28877
2021-12-01 12:16:14 +00:00
Andy Wilkinson
bad05a7860
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28879
2021-12-01 11:21:24 +00:00
Andy Wilkinson
c7c7592899
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28878
2021-12-01 11:21:04 +00:00
Andy Wilkinson
25bdc097a0
Make poms of all dependencies available in int test repo
...
Closes gh-28877
2021-12-01 11:20:21 +00:00
Andy Wilkinson
f3957b7639
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28865
2021-11-30 19:27:11 +00:00
Andy Wilkinson
9d4375bc12
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28864
2021-11-30 19:26:22 +00:00
Andy Wilkinson
572bd6ca5c
Upgrade to test-retry-gradle-plugin 1.3.1
...
Closes gh-28863
2021-11-30 19:26:09 +00:00
Andy Wilkinson
75c117a33f
Prepare 2.7.x branch
2021-11-30 15:02:11 +00:00
Andy Wilkinson
354a18c9a6
Prepare 2.6.x branch
2021-11-30 10:36:19 +00:00
Phillip Webb
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
Andy Wilkinson
381c094c41
Merge branch '2.5.x'
2021-11-19 13:39:37 +00:00
Andy Wilkinson
8f0e12dc34
Revert accidentally committed changes
...
This partially reverts commit c083e0b049
.
2021-11-19 13:39:22 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00: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
51dc02e37b
Merge branch '2.5.x'
...
See gh-28485
2021-10-29 17:18:52 +01:00
Andy Wilkinson
28d323ee3a
Merge branch '2.4.x' into 2.5.x
...
See gh-28484
2021-10-29 17:18:30 +01:00
Andy Wilkinson
b9e3660833
Revert running tests in parallel
...
See gh-19876
2021-10-29 17:18:13 +01:00
Andy Wilkinson
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
2021-10-29 12:48:45 +01:00
Phillip Webb
66aa713b85
Merge branch '2.5.x'
2021-10-14 17:41:06 -07:00
Phillip Webb
467e063d4b
Merge branch '2.4.x' into 2.5.x
2021-10-14 17:40:47 -07:00
Phillip Webb
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
2021-10-14 17:38:05 -07:00
Phillip Webb
e95b0b5257
Polish
2021-10-14 17:37:48 -07:00
Andy Wilkinson
37a7144426
Merge branch '2.5.x'
...
Closes gh-28343
2021-10-14 14:26:57 +01:00
Andy Wilkinson
1a30c660f3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28342
2021-10-14 14:22:25 +01:00
Andy Wilkinson
adb9226dec
Prohibit org.apache.geronimo.specs dependencies in our starters
...
Closes gh-28338
2021-10-14 14:19:21 +01:00
Andy Wilkinson
2d837a6eae
Merge branch '2.5.x'
...
Closes gh-28337
2021-10-14 13:48:08 +01:00
Andy Wilkinson
3800f060b5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28336
2021-10-14 13:42:54 +01:00
Andy Wilkinson
2fb8c8d27e
Check starters for unnecessary exclusions
...
Closes gh-28332
2021-10-14 13:37:53 +01:00
Andy Wilkinson
191b50241d
Merge branch '2.5.x'
...
Closes gh-28331
2021-10-14 10:13:37 +01:00
Andy Wilkinson
d3037103fe
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28330
2021-10-14 10:13:24 +01:00
Andy Wilkinson
9f13941c2f
Prohibit org.jboss.spec.* dependencies
...
Closes gh-28329
2021-10-14 10:09:30 +01:00
Phillip Webb
2034ad4827
Merge branch '2.5.x'
2021-10-13 18:48:18 -07:00
Phillip Webb
02b577390f
Merge branch '2.4.x' into 2.5.x
2021-10-13 18:47:51 -07:00
Phillip Webb
0561992c2a
Update copyright year of changed files
2021-10-13 18:45:38 -07:00
Andy Wilkinson
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
2021-10-06 10:03:24 +01:00
Andy Wilkinson
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson
0b58d4858d
Merge branch '2.5.x'
...
Closes gh-28200
2021-10-05 11:13:20 +01:00
Andy Wilkinson
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson
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
2021-10-05 11:08:22 +01:00
Andy Wilkinson
ea68672594
Merge branch '2.5.x'
...
Closes gh-28153
2021-09-30 17:06:09 +01:00
Andy Wilkinson
9e484e2cdc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson
3824512357
Tighten up build's task interdependencies
...
Closes gh-28103
2021-09-30 15:35:39 +01:00
dreis2211
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson
7c034c33e2
Merge branch '2.5.x'
...
Closes gh-27967
2021-09-13 10:48:19 +01:00
Andy Wilkinson
f530819d68
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27966
2021-09-13 10:47:47 +01:00
Andy Wilkinson
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
2021-09-13 10:47:14 +01:00
Andy Wilkinson
69d4e273d3
Merge branch '2.5.x'
...
Closes gh-27787
2021-08-20 13:56:09 +01:00
Andy Wilkinson
3566e5881b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428
Use snapshot rather than libs-snapshot when generating effective bom
...
Closes gh-27785
2021-08-20 13:53:34 +01:00
Andy Wilkinson
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
2021-08-18 13:48:29 +01:00
izeye
07da144826
Use 2012 for copyright beginning year
...
See gh-27734
2021-08-18 13:46:35 +01:00
Andy Wilkinson
44884cc495
Merge branch '2.5.x'
...
Closes gh-27752
2021-08-18 13:00:32 +01:00
Andy Wilkinson
10ceb504ae
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27751
2021-08-18 13:00:19 +01:00
Andy Wilkinson
32c184e31c
Revert changes made to work around JDK-8156584
...
Closes gh-26848
2021-08-18 13:00:11 +01:00
Andy Wilkinson
af13125796
Merge branch '2.5.x'
...
Closes gh-27498
2021-07-26 15:37:03 +01:00
Andy Wilkinson
9127588082
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27497
2021-07-26 15:36:52 +01:00
Andy Wilkinson
ea6cb74ccf
Ignore Spring Boot when finding dependency upgrades
...
Closes gh-27447
2021-07-26 15:36:08 +01:00
Andy Wilkinson
a5ec7560f5
Merge branch '2.5.x'
...
Closes gh-27314
2021-07-13 17:42:54 +01:00
dreis2211
e4978f604c
Fix JDK 16 pipeline
...
See gh-27310
2021-07-13 17:42:20 +01:00
Andy Wilkinson
9ccd6a6f2f
Merge branch '2.5.x'
...
Closes gh-27307
2021-07-13 15:56:32 +01:00
Andy Wilkinson
705feeed6a
Polish "Allow additional JVM args when running tests via toolchain"
...
See gh-27089
2021-07-13 15:28:04 +01:00
dreis2211
01b0156fed
Allow additional JVM args when running tests via toolchain
...
See gh-27089
2021-07-13 15:24:45 +01:00
Scott Frederick
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
2021-07-08 17:02:43 -05:00
Andy Wilkinson
fcf7240f3c
Merge branch '2.5.x'
...
See gh-27047
2021-06-24 10:03:44 +01:00
Andy Wilkinson
f7140d0401
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
2021-06-24 10:03:17 +01:00
Andy Wilkinson
316d2cce89
Don't offer upgrade for version that is already aligned
...
See gh-27044
2021-06-24 10:02:14 +01:00
Phillip Webb
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -07:00
Phillip Webb
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
Andy Wilkinson
aa3d72cb05
Merge branch '2.5.x'
...
See gh-27047
2021-06-23 19:52:04 +01:00
Andy Wilkinson
5139c79c4f
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
2021-06-23 19:51:40 +01:00
Andy Wilkinson
4d694ddaa8
Fix bom plugin management versions
...
See gh-27044
2021-06-23 19:50:06 +01:00
Andy Wilkinson
5d6a612b4b
Merge branch '2.5.x'
...
Closes gh-27047
2021-06-23 17:39:06 +01:00
Andy Wilkinson
ec2a7b9a5b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27045
2021-06-23 17:10:50 +01:00
Andy Wilkinson
363de4cfa5
Add dependency lock and constraint version alignment to Bomr
...
Closes gh-27044
2021-06-23 17:09:24 +01:00
Andy Wilkinson
06778abb61
Merge branch '2.5.x'
...
See gh-26934
2021-06-16 20:37:21 +01:00
Andy Wilkinson
577c58b798
Merge branch '2.4.x' into 2.5.x
...
See gh-26933
2021-06-16 20:35:56 +01:00
Andy Wilkinson
ac8c6a6fb7
Tune config of source and target compatilility with toolchain
...
See gh-26932
2021-06-16 20:33:17 +01:00
Andy Wilkinson
2106114f64
Merge branch '2.5.x'
...
Closes gh-26934
2021-06-16 19:57:00 +01:00
Andy Wilkinson
560d272db3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26933
2021-06-16 19:56:41 +01:00
Andy Wilkinson
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
2021-06-16 19:56:20 +01:00
Andy Wilkinson
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
2021-06-16 12:24:38 +01:00
Phillip Webb
28abcf88a0
Upgrade to spring-asciidoctor-backends 0.0.2
...
Closes gh-26846
2021-06-10 00:18:34 -07:00
Andy Wilkinson
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
Phillip Webb
6424e3de12
Merge branch '2.4.x'
...
Closes gh-26671
2021-05-25 17:40:23 -07:00
Phillip Webb
14f578ed80
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26670
2021-05-25 17:40:05 -07:00
Phillip Webb
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
2021-05-25 17:38:55 -07:00
Phillip Webb
60a8fae65c
Upgrade to spring-asciidoctor-backends 0.0.1
...
Closes gh-26293
2021-05-19 22:40:24 -07:00
Phillip Webb
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
2021-05-19 21:19:24 -07:00
Phillip Webb
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
2021-05-18 21:19:24 -07:00
Andy Wilkinson
a6dd97e40d
Polish
...
See gh-26576
2021-05-17 15:43:34 +01:00
Andy Wilkinson
763e58e392
Merge branch '2.4.x'
...
Closes gh-26576
2021-05-17 15:10:38 +01:00
Andy Wilkinson
ad5ba2e414
Compile Kotlin code will all warnings treated as errors
...
Closes gh-26083
2021-05-17 15:07:50 +01:00
Andy Wilkinson
aaceb9565c
Upgrade to Kotlin 1.5.0
...
Closes gh-26553
2021-05-17 13:39:56 +01:00
Andy Wilkinson
f7d28567c0
Merge branch '2.4.x'
...
Closes gh-26520
2021-05-17 10:35:44 +01:00
dreis2211
6179b99710
Remove add-opens workaround in ToolchainPlugin
...
See gh-26465
2021-05-17 09:57:18 +01:00
Phillip Webb
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
2021-05-10 18:04:05 -07:00
Stephane Nicoll
8d2fa26a99
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26394
2021-05-10 12:45:49 +02:00
Stephane Nicoll
a5cb9540ca
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26393
2021-05-10 09:38:41 +02:00
Andy Wilkinson
f17af829ee
Merge branch '2.4.x'
...
Closes gh-26354
2021-05-04 10:33:18 +01:00
Andy Wilkinson
75bb50bd02
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26353
2021-05-04 10:33:06 +01:00
Andy Wilkinson
deca737b01
Configure source and target compatibility at the task level
...
Closes gh-26350
2021-05-04 10:29:54 +01:00
Andy Wilkinson
5a3c354e6c
Merge branch '2.4.x'
...
Closes gh-26303
2021-04-29 12:24:18 +01:00
Andy Wilkinson
4abd6b1387
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26302
2021-04-29 12:24:06 +01:00
Andy Wilkinson
3cc1ed28ca
Order test tasks to run after Checkstyle and formatting checks
...
Closes gh-26284
2021-04-29 12:23:02 +01:00
Phillip Webb
3d9eb9e413
Switch to spring-asciidoctor-backends SNAPSHOT
...
See gh-26293
2021-04-28 21:53:33 -07:00
Andy Wilkinson
1be8c8fda9
Merge branch '2.4.x'
...
See gh-26261
2021-04-28 19:50:44 +01:00
Andy Wilkinson
4417e16963
Merge branch '2.3.x' into 2.4.x
...
See gh-26260
2021-04-28 19:50:17 +01:00
Andy Wilkinson
3a3eb1bc31
Fix workaround for JDK-8156584
...
See gh-26252
2021-04-28 19:49:26 +01:00
Andy Wilkinson
c548693fa1
Merge branch '2.4.x'
...
See gh-26261
2021-04-28 18:25:35 +01:00
Andy Wilkinson
097a436314
Merge branch '2.3.x' into 2.4.x
...
See gh-26260
2021-04-28 18:25:11 +01:00
Andy Wilkinson
ecd1e536cc
Refine workaround for JDK-8156584
...
The previous workaround worked but prevented caching of every test
task as the value of system property pointing to the custom security
properties file varied from build to build.
This commit refines the workaround to copy the file into the build
directory of the test task's project and reference it using a URL
that's relative to the task's working directory. This ensures that
the value of the system property doesn't change from build to build.
Closes gh-26252
2021-04-28 18:22:37 +01:00
Andy Wilkinson
03149eda9e
Merge branch '2.4.x'
...
Closes gh-26278
2021-04-28 13:34:52 +01:00
Andy Wilkinson
9cd15a1360
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26276
2021-04-28 13:20:11 +01:00
Andy Wilkinson
79ecf596ec
Set path sensitivity when configuring additional task inputs
...
Previously a number of file- or directory-based task inputs were
configured with specifying their path sensitivity. This meant
that the default absolute path sensitivity was used. For caches
that are cacheable this would result in a cache miss when the
inputs were identical other than being located at a different
absolute path as they are when running a CI build vs a local build.
This commit updates the configuration of additional task inputs
to use relative path sensitivity. A property name for each input has
also been configured. This makes them easier to identify in build
scans.
Closes gh-26270
2021-04-28 13:16:36 +01:00
Andy Wilkinson
e7c1c8937d
Merge branch '2.4.x'
...
Closes gh-26261
2021-04-27 17:34:52 +01:00
Andy Wilkinson
79d27344e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26260
2021-04-27 17:32:49 +01:00
Andy Wilkinson
912c82e50d
Work around https://bugs.openjdk.java.net/browse/JDK-8156584
...
sun.security.x509.AlgorithmId.get(String) isn't thread-safe and can
lead to null be returned for an algorithm that should be present.
This commit aims to work around this problem by avoiding the call
to AlgorithmId.get(String). It does so by configuring the
PKCS12 key protection algorithm to one that starts with
pbewithhmacsha (case insensitive). This short-circuits the logic
in PKCS12KeyStore.mapPBEAlgorithmToOID(String) and avoids the call to
AlgorithmId.get(String). Thanks again to @dreis2211 for the
suggestion.
The work around is only used when building with Java 8 as the problem
was fixed in Java 9.
Closes gh-26252
2021-04-27 17:27:28 +01:00
dreis2211
5219697eb7
Fix GitHub tag determination following main branch rename
...
See gh-26253
2021-04-27 15:26:26 +01:00
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
Phillip Webb
b4c9bb0d5c
Merge branch '2.4.x'
...
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87
Include optional shade plugin in published pom
...
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.
This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.
Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson
47709ec0e4
Align buildSrc's Kotlin version with main project's
...
See gh-26080
2021-04-13 20:49:10 +01:00
Stephane Nicoll
68046dd748
Update copyright year of changed file
...
See gh-25986
2021-04-12 08:42:17 +02:00
dreis2211
ea55ca9971
Remove unused method parameters
...
See gh-25986
2021-04-12 08:40:13 +02:00
Andy Wilkinson
734abc8127
Merge branch '2.4.x'
...
See gh-25988
2021-04-09 17:47:09 +01:00
Andy Wilkinson
92f9cfaf25
Merge branch '2.3.x' into 2.4.x
...
See gh-25987
2021-04-09 17:46:54 +01:00