search

cryostatio / cryostat-core

Core library providing a convenience wrapper and headless stubs for managing JFR with JDK Mission Control API
https://cryostat.io/
Other
8 stars 21 forks source link

fix(jmcagent): Move jfrprobes_schema.xsd to correct location, add ProbeValidatorTest (backport #452) #457

Closed mergify[bot] closed 3 weeks ago

mergify[bot] commented 3 weeks ago

Addresses https://github.com/cryostatio/cryostat-core/issues/450

Moves the JFR probes schema to the correct package and adds a ProbeValidator test to make sure this gets caught in future.

This is an automatic backport of pull request #452 done by Mergify.

mergify[bot] commented 3 weeks ago

Cherry-pick of 6228d49ccb760191b6d35ac287354eda16a9b698 has failed:

On branch mergify/bp/jdk11/pr-452
Your branch is up to date with 'origin/jdk11'.

You are currently cherry-picking commit 6228d49.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    new file:   cryostat-core/src/test/java/io/cryostat/core/jmcagent/ProbeValidatorTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    both deleted:    cryostat-core/src/main/resources/io/cryostat/core/agent/jfrprobes_schema.xsd
    added by them:   cryostat-core/src/main/resources/io/cryostat/core/jmcagent/jfrprobes_schema.xsd
    added by us:     src/main/resources/io/cryostat/core/agent/jfrprobes_schema.xsd

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

andrewazores commented 3 weeks ago

Not needed - jdk11 branch is not affected by the bug.