Merge branch 'main' of github.com:cryostatio/cryostat

cryostatio · Oct 24, 2023 · 3e2ed06 · 3e2ed06
2 parents f6f36df + a42fe3f
commit 3e2ed06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@
 
   <io.reactiverse.plugin.version>1.0.27</io.reactiverse.plugin.version>
   <org.apache.maven.plugins.compiler.version>3.11.0</org.apache.maven.plugins.compiler.version>
-  <org.apache.maven.plugins.surefire.version>3.1.2</org.apache.maven.plugins.surefire.version>
+  <org.apache.maven.plugins.surefire.version>3.2.1</org.apache.maven.plugins.surefire.version>
   <org.apache.maven.plugins.failsafe.version>${org.apache.maven.plugins.surefire.version}</org.apache.maven.plugins.failsafe.version>
   <org.apache.maven.plugins.site.version>3.12.1</org.apache.maven.plugins.site.version>
   <org.apache.maven.plugins.info.reports.version>3.4.5</org.apache.maven.plugins.info.reports.version>
@@ -78,7 +78,7 @@
   <org.codehaus.mojo.exec.plugin.version>3.1.0</org.codehaus.mojo.exec.plugin.version>
   <org.codehaus.mojo.build.helper.plugin.version>3.4.0</org.codehaus.mojo.build.helper.plugin.version>
   <com.mycila.license.maven.plugin.version>4.3</com.mycila.license.maven.plugin.version>
-  <org.owasp.dependency.check.version>8.4.0</org.owasp.dependency.check.version>
+  <org.owasp.dependency.check.version>8.4.2</org.owasp.dependency.check.version>
   <com.google.cloud.tools.jib.maven.plugin.version>3.4.0</com.google.cloud.tools.jib.maven.plugin.version>
 
   <!-- Use a separate property for dependency alignment purposes. -->

diff --git a/src/container/Dockerfile b/src/container/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17-1.1696520331
+FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17-2
 
 USER root
 

diff --git a/web-client b/web-client
+0 −3		jest.config.js
+13 −15		package.json
+12 −17		src/app/AppLayout/AppLayout.tsx
+5 −5		src/app/AppLayout/SslErrorModal.tsx
+4 −4		src/app/Archives/Archives.tsx
+7 −6		src/app/CreateRecording/CustomRecordingForm.tsx
+7 −5		src/app/CreateRecording/SnapshotRecordingForm.tsx
+5 −7		src/app/Dashboard/Charts/jfr/JFRMetricsChartCard.tsx
+3 −3		src/app/Dashboard/Dashboard.tsx
+5 −5		src/app/Dashboard/DashboardSolo.tsx
+4 −5		src/app/Events/EventTemplates.tsx
+7 −7		src/app/Events/Events.tsx
+1 −2		src/app/QuickStarts/QuickStartsCatalogPage.tsx
+4 −6		src/app/Recordings/ActiveRecordingsTable.tsx
+4 −4		src/app/Recordings/Recordings.tsx
+4 −4		src/app/Rules/CreateRule.tsx
+4 −5		src/app/Rules/Rules.tsx
+6 −7		src/app/SecurityPanel/Credentials/StoreCredentials.tsx
+1 −1		src/app/SecurityPanel/ImportCertificate.tsx
+4 −4		src/app/Settings/Settings.tsx
+5 −2		src/app/Shared/Components/FileUploads.tsx
+5 −0		src/app/Shared/Components/JmxAuthDescription.tsx
+7 −7		src/app/Topology/Actions/CreateTarget.tsx
+6 −6		src/app/Topology/Actions/NodeActions.tsx
+7 −7		src/app/Topology/Actions/QuickSearchPanel.tsx
+5 −5		src/app/Topology/Actions/WarningResolver.tsx
+2 −2		src/app/Topology/Actions/quicksearches/custom-target.tsx
+2 −2		src/app/Topology/Actions/types.ts
+8 −8		src/app/Topology/Actions/utils.tsx
+2 −3		src/app/Topology/Entity/utils.tsx
+1 −2		src/app/Topology/Toolbar/DisplayOptions.tsx
+1 −2		src/app/Topology/Topology.tsx
+31 −40		src/app/routes.tsx
+3 −3		src/app/utils/utils.ts
+7 −13		src/test/About/About.test.tsx
+12 −21		src/test/Agent/AgentLiveProbes.test.tsx
+25 −11		src/test/Agent/AgentProbeTemplates.test.tsx
+15 −20		src/test/Archives/AllArchivedRecordingsTable.test.tsx
+21 −22		src/test/Archives/AllTargetsArchivedRecordingsTable.test.tsx
+9 −26		src/test/Archives/Archives.test.tsx
+11 −11		src/test/Archives/__snapshots__/Archives.test.tsx.snap
+0 −247		src/test/Common.tsx
+39 −29		src/test/CreateRecording/CustomRecordingForm.test.tsx
+44 −26		src/test/CreateRecording/SnapshotRecordingForm.test.tsx
+73 −15		src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.test.tsx
+11 −17		src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCardList.test.tsx
+52 −25		src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigDrawer.test.tsx
+21 −5		src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.test.tsx
+26 −6		src/test/Dashboard/AutomatedAnalysis/ClickableAutomatedAnalysisLabel.test.tsx
+97 −43		src/test/Dashboard/AutomatedAnalysis/Filters/AutomatedAnalysisNameFilter.test.tsx
+23 −5		src/test/Dashboard/AutomatedAnalysis/Filters/AutomatedAnalysisScoreFilter.test.tsx
+97 −43		src/test/Dashboard/AutomatedAnalysis/Filters/AutomatedAnalysisTopicFilter.test.tsx
+95 −117		src/test/Dashboard/Charts/jfr/JFRMetricsChartCard.test.tsx
+34 −38		src/test/Dashboard/Charts/mbean/MBeanMetricsChartCard.test.tsx
+4 −24		src/test/Dashboard/Dashboard.test.tsx
+11 −18		src/test/Dashboard/DashboardLayoutToolbar.test.tsx
+242 −0		src/test/Dashboard/__snapshots__/DashboardLayoutToolbar.test.tsx.snap
+72 −22		src/test/DateTimePicker/DateTimePicker.test.tsx
+21 −7		src/test/DateTimePicker/MeridiemPicker.test.tsx
+69 −37		src/test/DateTimePicker/TimePicker.test.tsx
+55 −12		src/test/DateTimePicker/TimezonePicker.test.tsx
+112 −33		src/test/Events/EventTemplates.test.tsx
+32 −15		src/test/Events/EventTypes.test.tsx
+92 −30		src/test/RecordingMetadata/BulkEditLabels.test.tsx
+61 −19		src/test/RecordingMetadata/ClickableLabel.test.tsx
+53 −21		src/test/RecordingMetadata/LabelCell.test.tsx
+150 −19		src/test/RecordingMetadata/RecordingLabelFields.test.tsx
+158 −88		src/test/Recordings/ActiveRecordingsTable.test.tsx
+210 −136		src/test/Recordings/ArchivedRecordingsTable.test.tsx
+51 −6		src/test/Recordings/Filters/DatetimeFilter.test.tsx
+113 −54		src/test/Recordings/Filters/DurationFilter.test.tsx
+109 −26		src/test/Recordings/Filters/LabelFilter.test.tsx
+87 −26		src/test/Recordings/Filters/NameFilter.test.tsx
+63 −23		src/test/Recordings/Filters/RecordingStateFilter.test.tsx
+184 −129		src/test/Recordings/RecordingFilters.test.tsx
+29 −15		src/test/Recordings/RecordingLabelsPanel.test.tsx
+54 −25		src/test/Recordings/Recordings.test.tsx
+193 −121		src/test/Recordings/RecordingsTable.test.tsx
+10 −10		src/test/Recordings/__snapshots__/Recordings.test.tsx.snap
+75 −19		src/test/Rules/CreateRule.test.tsx
+114 −37		src/test/Rules/Rules.test.tsx
+91 −11		src/test/SecurityPanel/Credentials/StoreCredentials.test.tsx
+42 −14		src/test/Settings/AutoRefresh.test.tsx
+12 −10		src/test/Settings/AutomatedAnalysisConfig.test.tsx
+21 −3		src/test/Settings/CredentialsStorage.test.tsx
+31 −4		src/test/Settings/DatetimeControl.test.tsx
+42 −14		src/test/Settings/DeletionDialogControl.test.tsx
+21 −3		src/test/Settings/FeatureLevels.test.tsx
+41 −5		src/test/Settings/Language.test.tsx
+52 −15		src/test/Settings/NotificationControl.test.tsx
+63 −23		src/test/Settings/Settings.test.tsx
+21 −3		src/test/Settings/Theme.test.tsx
+32 −13		src/test/Settings/WebSocketDebounce.test.tsx
+22 −7		src/test/Shared/Components/LoadingView.test.tsx
+41 −5		src/test/TargetView/TargetSelect.test.tsx
+149 −0		src/test/utils.tsx
+190 −448		yarn.lock