Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 3, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 3, 2024

Addresses #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.

…beValidatorTest (#452)

(cherry picked from commit 6228d49)

# Conflicts:
#	cryostat-core/src/main/resources/io/cryostat/core/agent/jfrprobes_schema.xsd
#	cryostat-core/src/main/resources/io/cryostat/core/jmcagent/jfrprobes_schema.xsd
#	src/main/resources/io/cryostat/core/agent/jfrprobes_schema.xsd
Copy link
Author

mergify bot commented Sep 3, 2024

Cherry-pick of 6228d49 has failed:

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

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 andrewazores force-pushed the mergify/bp/cryostat-v3.0/pr-452 branch from ef22ba3 to 405e5e8 Compare September 3, 2024 15:32
@andrewazores andrewazores merged commit a188179 into cryostat-v3.0 Sep 3, 2024
9 of 15 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-452 branch September 3, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants