Steve Riesenberg 9db33f33c7 Revert unnecessary merges on 6.0.x ...

This commit removes unnecessary main-branch merges starting from
8750608b5b and adds the following
needed commit(s) that were made afterward:

- 5dce82c48b

2023-10-31 15:11:45 -05:00

..

src

Revert unnecessary merges on 6.0.x

2023-10-31 15:11:45 -05:00

spring-security-test.gradle

Revert unnecessary merges on 6.0.x

2023-10-31 15:11:45 -05:00

template.mf

SEC-2015: Add spring-security-test

2014-04-22 16:47:48 -05:00