RFR: 7307: Move org.openjdk.jmc.flightrecorder.configuration bundle from application to core [v2]

[Alex Macdonald]

On Tue, 8 Aug 2023 14:59:52 GMT, Joshua Matsuoka <jmatsuoka at openjdk.org> wrote:

>> This PR addresses JMC-7307 [[0]](https://bugs.openjdk.java.net/browse/JMC-7307), in which it would be helpful to have flightrecorder.configuration distributed in jmc core.
>> 
>> This PR continues from #299 , Alex is currently away so I'll be continuing this PR/bug. This PR builds off of Alex's existing branch and preserves the history. It fixes the merge conflicts and addresses the remaining review comments on #299 .
>> 
>> [0] https://bugs.openjdk.java.net/browse/JMC-7307
>
> Joshua Matsuoka has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 18 commits:
> 
>  - Fixing merge conflicts
>  - Merge remote-tracking branch 'upstream/master' into 7307
>  - Fixing manifest
>  - Fixing visibility of XML classes
>  - Addressing review comments
>  - Merge remote-tracking branch 'aptmac/PR-7307' into 7307
>  - update license headers to 2022
>  - fix package name in JFCXMLValidator logger
>  - re-order flightrecorder.configuration.test in test pom
>  - update license headers
>  - ... and 8 more: https://git.openjdk.org/jmc/compare/75f89e73...10171662

Thanks for giving this PR an update. It looks like there's a few (3) files with some leftovers from resolving merge conflicts that are causing build issues. Also the license headers will need to be updated to 2023 at some point as well.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/jvm/JVMType.java line 50:

> 48: 	HOTSPOT,
> 49: 	/**
> 50: <<<<<<< HEAD

There are a couple in this file

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/ISecurityManager.java line 193:

> 191: 	 * @param encryptionCipher
> 192: 	 *            the encryption cipher to use.
> 193: <<<<<<< HEAD

and in here

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/util/Environment.java line 93:

> 91: 
> 92: 	/**
> 93: <<<<<<< HEAD

And here too.

-------------

PR Review: https://git.openjdk.org/jmc/pull/469#pullrequestreview-1569543409
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1288473222
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1288474124
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1288474338