396 Commits

Author SHA1 Message Date
Steve Riesenberg
674ce38bd3
Merge branch '6.1.x' 2023-12-05 13:36:55 -06:00
Steve Riesenberg
7aa6e0d787
Merge branch '6.0.x' into 6.1.x 2023-12-05 13:35:45 -06:00
Steve Riesenberg
f6843b2bd9
Use env var to determine Artifactory URL
Closes gh-14246
2023-12-05 13:33:45 -06:00
Marcus Hert Da Coregio
6e0fb2fc96 Merge branch '6.1.x' 2023-11-06 15:03:06 -03:00
Marcus Hert Da Coregio
99c84aa935 Merge branch '6.0.x' into 6.1.x 2023-11-06 15:02:09 -03:00
Marcus Hert Da Coregio
3893136084 Remove Gradle deprecations
Stop using JavaPluginConvention type and replace outputFile with destinationFile

Issue gh-13864
2023-11-06 15:01:38 -03:00
Steve Riesenberg
447f40949c
Revert unnecessary merges on 6.1.x
This commit removes unnecessary main-branch merges starting from
9f8db22b774fe78fef3598c07e184c371892c1c7 and adds the following
needed commit(s) that were made afterward:

- 4d6ff49b9d663d0f25454f3704a45c83b35da689
- ed6ff670d102736eea0ac360921c9015151ac630
- c823b007942a04a27d02c0a28bc2ad85e8790084
- 44fad21363bef1b06422be28c9bbfadde5e44804
2023-10-31 15:22:15 -05:00
Steve Riesenberg
9db33f33c7
Revert unnecessary merges on 6.0.x
This commit removes unnecessary main-branch merges starting from
8750608b5bca45525c99d0a41a20ed02de93d8c7 and adds the following
needed commit(s) that were made afterward:

- 5dce82c48bc0b174838501c5a111b2de70822914
2023-10-31 15:11:45 -05:00
Marcus Hert Da Coregio
9f8db22b77 Merge branch '6.1.x' 2023-10-30 16:14:08 -03:00
Marcus Hert Da Coregio
8750608b5b Merge branch '6.0.x' into 6.1.x 2023-10-30 16:14:03 -03:00
Marcus Hert Da Coregio
21b7c95d83 Merge branch '5.8.x' into 6.0.x 2023-10-30 16:13:56 -03:00
Marcus Hert Da Coregio
3f64c6d745 Use version catalog to resolve nimbus dependency versions
Issue gh-14047
2023-10-30 16:11:51 -03:00
Marcus Hert Da Coregio
2cd302fb1b Revert "Use lenient configuration for prohibited dependencies check"
This reverts commit 602d4189d11a3cd59d07f77b81721731f191534e.
2023-10-30 16:11:02 -03:00
Marcus Hert Da Coregio
d37266d03d Merge branch '6.1.x' 2023-10-30 14:47:29 -03:00
Marcus Hert Da Coregio
bbf687c0ac Merge branch '6.0.x' into 6.1.x 2023-10-30 14:47:24 -03:00
Marcus Hert Da Coregio
3826a5e986 Merge branch '5.8.x' into 6.0.x 2023-10-30 14:47:17 -03:00
Marcus Hert Da Coregio
e8ec49b4c5 Resolve versions without downloading dependencies
Issue gh-14047
2023-10-30 14:46:12 -03:00
Marcus Hert Da Coregio
74e3551442 Merge branch '6.1.x' 2023-10-30 12:10:54 -03:00
Marcus Hert Da Coregio
aa6577da92 Merge branch '6.0.x' into 6.1.x 2023-10-30 12:10:47 -03:00
Marcus Hert Da Coregio
01a0c8845b Merge branch '5.8.x' into 6.0.x 2023-10-30 12:10:42 -03:00
Marcus Hert Da Coregio
602d4189d1 Use lenient configuration for prohibited dependencies check
Issue gh-14047
2023-10-30 12:10:32 -03:00
Marcus Hert Da Coregio
aa3e839bc7 Merge branch '6.1.x' 2023-10-30 11:25:56 -03:00
Marcus Hert Da Coregio
ee73f7d508 Merge branch '6.0.x' into 6.1.x 2023-10-30 11:25:46 -03:00
Marcus Hert Da Coregio
b17c0a5c59 Merge branch '5.8.x' into 6.0.x 2023-10-30 11:25:41 -03:00
Marcus Hert Da Coregio
884014c2fb Use lenient configuration to resolve artifacts
Issue gh-14047
2023-10-30 11:25:30 -03:00
Marcus Hert Da Coregio
9342699abc Merge branch '6.1.x' 2023-10-30 08:30:04 -03:00
Marcus Hert Da Coregio
1eaaa90e43 Merge branch '6.0.x' into 6.1.x 2023-10-30 08:29:57 -03:00
Marcus Hert Da Coregio
602a991971 Merge branch '5.8.x' into 6.0.x 2023-10-30 08:29:51 -03:00
Marcus Hert Da Coregio
47969ec7c9 Fix verifyDependenciesVersions not working with s101
Issue gh-14047
2023-10-30 08:28:15 -03:00
Marcus Da Coregio
c954b6aafd Merge branch '6.1.x' 2023-10-27 09:47:50 -03:00
Marcus Da Coregio
6d9c2c66fb Merge branch '6.0.x' into 6.1.x 2023-10-27 09:47:34 -03:00
Marcus Da Coregio
094e3b8a1d Merge branch '5.8.x' into 6.0.x 2023-10-27 09:47:18 -03:00
Marcus Da Coregio
6654479649 Polish VerifyDependenciesVersionsPlugin
Issue gh-14047
2023-10-27 09:45:19 -03:00
Marcus Da Coregio
70b0cd66e1 Merge branch '6.1.x'
Closes gh-14050
2023-10-25 13:46:50 -03:00
Marcus Da Coregio
e38fee2b40 Merge branch '6.0.x' into 6.1.x
Closes gh-14049
2023-10-25 13:46:41 -03:00
Marcus Da Coregio
28dcceae2e Merge branch '5.8.x' into 6.0.x
Closes gh-14048
2023-10-25 13:46:32 -03:00
Marcus Da Coregio
ad2bea3350 Fail build if nimbus-jose-jwt version is not aligned
Closes gh-14047
2023-10-25 13:44:23 -03:00
Marcus Da Coregio
a804355f5c Merge branch '6.1.x'
Closes gh-14035
2023-10-18 14:29:30 -03:00
Marcus Da Coregio
93905574d3 Merge branch '6.0.x' into 6.1.x
Closes gh-14034
2023-10-18 14:28:11 -03:00
Marcus Da Coregio
fb28ce6aa2 Merge branch '5.8.x' into 6.0.x
Closes gh-14033
2023-10-18 14:26:28 -03:00
Marcus Da Coregio
736f1c27cd Remove updateDependencies plugin
Closes gh-13966
2023-10-18 14:12:25 -03:00
Marcus Da Coregio
a67c0a1233 Merge branch '6.1.x' 2023-10-10 13:18:30 -03:00
Marcus Da Coregio
84df78af12 Merge branch '6.0.x' into 6.1.x 2023-10-10 13:18:24 -03:00
Marcus Da Coregio
d0ce8a412f Remove calls to setCanBeResolved(true) in IntegrationTestPuglin
Issue gh-13864
2023-10-10 13:08:21 -03:00
Marcus Da Coregio
5a10d2f08c Merge branch '6.1.x' 2023-09-28 15:14:55 -03:00
Marcus Da Coregio
6a97f3f982 Merge branch '6.0.x' into 6.1.x 2023-09-28 15:13:29 -03:00
Marcus Da Coregio
c6841d83eb Merge branch '5.8.x' into 6.0.x 2023-09-28 15:01:58 -03:00
Marcus Da Coregio
e29ea47ff7 Use Gradle's Version Catalog
Issue gh-13868
2023-09-28 14:57:18 -03:00
Marcus Da Coregio
872de2f20f Merge branch '6.1.x' 2023-09-21 15:29:35 +01:00
Marcus Da Coregio
fcb88d3316 Merge branch '6.0.x' into 6.1.x 2023-09-21 15:29:22 +01:00