Commit Graph

222 Commits

Author SHA1 Message Date
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
f06c2b9c62 Move sourceSet Declaration Before configurations
Prior to this commit, with Gradle >= 8.1, we were seeing some NoClassDefFoundError related to the sun/reflect/Reflection class when running integrationTest. The error was caused because Gradle was picking the integrationTestRuntimeClasspath instead of runtimeElements, and the integrationTestRuntimeClasspath does not have the proper transitive dependencies.

This commit moves the sourceSet declaration before the configurations declaration, allowing Gradle to create the named configuration automatically using the role with the allowed usage it expects, preventing integrationTestRuntimeClasspath from being selected. The related issue in Gradle is https://github.com/gradle/gradle/issues/26461

Issue gh-13408
2023-09-21 15:28:25 +01:00
Marcus Da Coregio
9e57e49fd6 Upgrade to Gradle 8.3
Closes gh-13408
2023-09-21 15:28:24 +01:00
Rob Winch
342735043d Merge branch '5.8.x' into 6.0.x
Automate spring-security.xsd

Closes gh-13824
2023-09-14 23:42:31 -05:00
Rob Winch
779541b340 Merge branch '5.7.x' into 5.8.x
Automate spring-security.xsd

Closes gh-13823
2023-09-14 23:37:53 -05:00
Rob Winch
5b293d2116 Automate spring-security.xsd
Closes gh-13819
2023-09-14 16:01:50 -05:00
Steve Riesenberg
a580856bb2 Update jacoco tool version to 0.8.9
Closes gh-13798
2023-09-12 17:00:12 -05:00
Rob Winch
c4b773b150 Merge branch '5.8.x' into 6.0.x
Use includeGroupByRegex

This makes the include more robust

Issue gh-13582
2023-08-07 10:27:32 -05:00
Rob Winch
82e5f62079 Use includeGroupByRegex
This makes the include more robust

Issue gh-13582
2023-08-07 10:26:57 -05:00
Rob Winch
4257a97504 Merge branch '5.8.x' into 6.0.x
Dependencies are resolved from appropriate repositories

Closes gh-13622
2023-08-07 09:51:55 -05:00
Eric Haag
30bc2634d7 Optimize configuration of project repositories
This change applies repository content filtering to configured
repositories, reducing the time spent during dependency resolution.

This fixes an issue where requests for 'org.opensaml',
'net.shibboleth.utilities' and 'net.minidev' dependencies were being
made in the Spring releases repositories, resulting in many failed
requests during dependency resolution and increased resolution times.

Closes gh-13582
2023-08-07 09:51:42 -05:00
Steve Riesenberg
f5538be8d0 Merge branch '5.8.x' into 6.0.x 2023-07-12 16:06:20 -05:00
Steve Riesenberg
e7201c48d1 Fix copy/paste from main
Issue gh-13500
2023-07-12 16:04:35 -05:00
Steve Riesenberg
f0f6de435d Merge branch '5.8.x' into 6.0.x 2023-07-12 15:53:14 -05:00
Steve Riesenberg
991b398c55 Create release with full docs path
Closes gh-13500
2023-07-12 15:51:44 -05:00
Janne Valkealahti
c053f6f0c6 Make eclipse/vscode project import work
- Gradle projects contain cycles which comes from dependencies to
  test sources which is not a problem in gradle but eclipse metadata
  generation is getting confused. Thus we need settings to relax errors
  org.eclipse.jdt.core.circularClasspath=warning
  org.eclipse.jdt.core.incompleteClasspath=warning
- Additionally .classpath entries needs to be changes having
  without_test_code=false
  test=false
- Aspects end up getting source dirs `build/classes/java/main`
  and `build/resources/main` which never have sources. Vscode complains
  about that, eclipse is fine. Remove those from entries.
- In tests `htmlunit` depends on `xml-apis`. `xml-apis` are now part
  of jdk and eclipse complains about that. Excluse these in a gradle build.
- Both eclipse and vscode don't currently work with buildship, due to
  project cycles and buildship cannot be configured. It's possible to
  create metadata from `eclipse` task manually which then can be imported.
  For this we need to disable automatic import in vscode using buildship.
  This goes to `.vscode/settings.json` workspace config.
- Then with these changes user can do something like
  git clean -fxd && ./gradlew clean build cleanEclipse eclipse -x checkstyleNohttp -x test -x integrationTest
  and import projects manually.
2023-06-05 13:34:30 -06:00
Josh Cummings
7c54c0e4fa Merge branch '5.8.x' into 6.0.x
Closes gh-13208
2023-05-22 15:43:27 -06:00
Josh Cummings
1eefd433b6 Add spring-security.xsd symlink
Closes gh-13131
2023-05-22 15:42:02 -06:00
Steve Riesenberg
e144a84163 Merge branch '5.8.x' into 6.0.x 2023-03-01 11:50:27 -06:00
Steve Riesenberg
fabf7f649c Fix path of copied schema files
Issue gh-12804
2023-03-01 11:49:36 -06:00
Steve Riesenberg
82ffc954d3 Merge branch '5.8.x' into 6.0.x
Closes gh-12806
2023-02-28 16:20:24 -06:00
Steve Riesenberg
26566af431 Copy spring-security-oauth schemas on deploy
Closes gh-12804
2023-02-28 16:16:08 -06:00
Steve Riesenberg
2a4fe7de58 Merge branch '5.8.x' into 6.0.x
Closes gh-12802
2023-02-28 14:14:11 -06:00
Steve Riesenberg
5257e36ffc Update SaganApi to work with Contentful backend
Also fixed an issue with incorrect referenceDocUrl for Antora
with SNAPSHOT versions.

Closes gh-12575
2023-02-28 14:09:51 -06:00
Josh Cummings
f125785328 Update io.spring.nohttp to 0.0.11
Closes gh-12734
2023-02-17 15:53:16 -07:00
Marcus Da Coregio
d127ad310f Update io.spring.nohttp to 0.0.11
Closes gh-12703
2023-02-17 14:53:21 -03:00
Marcus Da Coregio
5e4f1ba211 Merge branch '5.8.x'
Closes gh-11826
2022-09-16 10:19:32 -03:00
Marcus Da Coregio
b6a8c10d05 Merge branch '5.6.x' into 5.7.x
Closes gh-11824
2022-09-16 10:17:21 -03:00
Marcus Da Coregio
7756247c3a Simplify checkSamples task
Closes gh-11814
2022-09-16 09:36:12 -03:00
Marcus Da Coregio
00584327bd Merge branch '5.8.x'
Closes gh-11769
2022-08-30 11:01:15 -03:00
Marcus Da Coregio
db95f6d5c5 Merge branch '5.6.x' into 5.7.x
Closes gh-11767
2022-08-30 10:54:50 -03:00
Marcus Da Coregio
40abf87ae6 Add buildScan to checkRemote
Closes gh-11766
2022-08-30 09:11:08 -03:00
Rob Winch
f33d7253b6 GitHubMilestoneApiTests due_on Uses LocalDate
`GitHubMilestoneApiTests` uses `Instant.now()` for `due_on`. Since
`Instant.now()` is UTC time based,
`isMilestoneDueTodayWhenDueTodayThenTrue` fails when the computer that runs
the test is not the same day as it is in UTC time.

To fix it, `due_on` should be set to an `Instant` based upon the timezone
of the current computer.

Closes gh-11706
2022-08-15 13:04:29 -05:00
Rob Winch
d8ae2c8763 GitHubMilestoneApiTests due_on Uses LocalDate
`GitHubMilestoneApiTests` uses `Instant.now()` for `due_on`. Since
`Instant.now()` is UTC time based,
`isMilestoneDueTodayWhenDueTodayThenTrue` fails when the computer that runs
the test is not the same day as it is in UTC time.

To fix it, `due_on` should be set to an `Instant` based upon the timezone
of the current computer.

Closes gh-11706
2022-08-15 13:03:10 -05:00
Rob Winch
c7b39eed58 GitHubMilestoneApiTests due_on Uses LocalDate
`GitHubMilestoneApiTests` uses `Instant.now()` for `due_on`. Since
`Instant.now()` is UTC time based,
`isMilestoneDueTodayWhenDueTodayThenTrue` fails when the computer that runs
the test is not the same day as it is in UTC time.

To fix it, `due_on` should be set to an `Instant` based upon the timezone
of the current computer.

Closes gh-11706
2022-08-15 13:02:32 -05:00
Rob Winch
7a860e1568 Fix Snapshot Sources/Javadoc
This commit merges a workaround to an issue in JFrog's Gradle plugin
which causes SNAPSHOT javadoc and sources to become out of sync and thus
prevents users from being able to download either.

Closes gh-10602
2022-07-26 16:26:31 -05:00
Rob Winch
ad9e737bf2 Fix Snapshot Sources/Javadoc
This commit merges a workaround to an issue in JFrog's Gradle plugin
which causes SNAPSHOT javadoc and sources to become out of sync and thus
prevents users from being able to download either.

Closes gh-10602
2022-07-26 16:25:52 -05:00
Rob Winch
b6258fe1f9 Apply ArtifactoryPlugin in RootProjectPlugin
Issue gh-10602
2022-07-26 15:42:51 -05:00
Rob Winch
8aa6fbfed2 ArtifactoryPlugin only apply default publications for MavenPublishPlugin
Issue gh-10602
2022-07-26 15:42:51 -05:00
Steve Riesenberg
148756076c Backport release automation and github actions
Closes gh-11501
2022-07-13 15:51:25 -05:00
Steve Riesenberg
6f321a27c4 Fix inconsistency in hasProperty check 2022-07-13 15:51:25 -05:00
Steve Riesenberg
539443b4be Add GitHubReleasePlugin with createGitHubRelease task
Issue gh-10456
Issue gh-10457
2022-07-13 15:51:24 -05:00
Steve Riesenberg
d76c321f8c Backport release automation and github actions
Closes gh-11500
2022-07-13 15:17:03 -05:00
Steve Riesenberg
98fbc7a88f Calculate release day from the first Monday
Fixes an issue where the first day of the month is (for example) a
Tuesday causing the 2nd Tuesday and 3rd Monday to be over a week apart.

Issue gh-10458
2022-06-09 15:30:37 -05:00
Steve Riesenberg
0ec64c0843 Polish GitHubMilestonePlugin 2022-06-03 15:07:42 -05:00
Steve Riesenberg
46723a601c Add workflow step for scheduling the next milestone
This step introduces the concept of a release train to determine the appropriate release dates and schedules milestones as needed. It uses the following rules:

- If the current SNAPSHOT version is a minor release (patchVersion == 0), checks to see if a GA release exists. If not, a release train is scheduled as follows:
  - Finds the next available release train starting month (including this month), either January or July.
  - Schedules a release train with M1, M2, M3, RC1 and GA versions on either January/February/March/April/May or July/August/September/October/November
- If the current SNAPSHOT version is a patch release (patchVersion != 0), checks to see if a GA release exists. If not, an individual milestone is scheduled on the next even month whose release day is in the future (can include this month).
- In either case, the release day used to schedule the release is based on the configured weekOfMonth (1-4) and dayOfWeek (1-5), e.g. 3rd Monday of the month (3, 1).

If a milestone already exists, nothing is created. Once created, milestone due dates can be updated manually as desired.

Closes gh-10458
2022-06-03 15:07:42 -05:00
Steve Riesenberg
ab3b6ae95f Add scheduleNextRelease gradle task 2022-06-03 15:07:42 -05:00
Steve Riesenberg
1295b793b3 Polish gh-11183
Fixed typo in plugin for setting workflowId and added missing repository() closure
2022-06-03 11:56:08 -05:00
Steve Riesenberg
2c93a92afa Add dispatchGitHubWorkflow gradle task 2022-06-03 10:19:02 -05:00