Stephane Nicoll
01c19ef444
Merge branch '2.5.x' into 2.6.x
2022-01-02 11:30:11 +01:00
Stephane Nicoll
a0537888f5
Upgrade build to Log4j 2.17.1
2022-01-02 11:29:56 +01:00
Stephane Nicoll
f54ea67ed6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211
7a87d18b12
Update copyrights to 2022
...
See gh-29195
2022-01-02 11:24:58 +01:00
Madhura Bhave
34f96514ad
Fix link to source code in snapshot documentation
...
Fixes gh-28856
2021-12-20 10:49:07 -08:00
Stephane Nicoll
e048562c34
Merge branch '2.5.x' into 2.6.x
...
See gh-28984
2021-12-18 17:53:39 +01:00
Stephane Nicoll
21e54a595e
Upgrade Build to Log4j 2.17.0
...
See gh-28983
2021-12-18 17:53:30 +01:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Scott Frederick
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
2021-12-15 14:04:17 -06:00
Stephane Nicoll
15ade0b5d3
Upgrade to Log4j2 2.16.0
...
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
2021-12-15 09:28:44 +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
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
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
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
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