Mark ApacheDSContainer as deprecated #6002

[LukeButters]

Mark ApacheDSContainer as deprecated because ApacheDS have not released a recent GA version and the current GA version does not work under jdk11.

See #6002

[pivotal-issuemaster]

@LukeButters Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

[pivotal-issuemaster]

@LukeButters Thank you for signing the Contributor License Agreement!

[rwinch]

Thanks for the PR! I provided feedback inline

[rwinch]

Thanks. Can you please squash and then please update the commit message to align with the Spring Security conventions? It should end with Fixes: gh-6002

[LukeButters]

sorry how do I do that?

[rwinch]

I've found the free Pro Git Book to be a very valuable resource. Section 7.6 Git Tools - Rewriting History is probably the most relevant in this situation. I have provided the steps below for you to make it easier, but I highly recommend reading Pro Git.

git rebase -i HEAD~2

This says you want to do an interactive rebase of the last two commits. This means you want to change those commits. This rewrites the history. Keep in mind on branches that others use this is not proper etiquette because it makes merging difficult. For feature branches like what you have this is expected and quite normal.

You editor will popup and look like this:

pick 8de408229 Mark ApacheDSContainer as deprecated #6002
pick 8e7830791 Add an explanation as to why ApacheDSContainer is deprecated.
...

Change the start of each like to be

r 8de408229 Mark ApacheDSContainer as deprecated #6002
f 8e7830791 Add an explanation as to why ApacheDSContainer is deprecated.

r will indicate you want to reword that commit. f will indicate that the commit should be squashed into the previous commit.

Change the wording of the commit and save. Then you can force push to your remote. Something like:

git push -f origin master

[LukeButters]

thanks! It looks like i squished the commits and the message has been updated.

[rwinch]

Thanks for the updates. I merged this via 0b40d09 and polished it to confirm to the checkstyle (removed trailing whitespace) using 802f318.