Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-32.x' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
opennms-bamboo committed Jun 29, 2023
2 parents b291e37 + 1263033 commit 4cc8389
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions core/web-assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ These minimum configuration parameters are available in all monitors and describ

| rrd-status
| Enable xref:operation:deep-dive/service-assurance/polling-packages.adoc#service-status-persistence[service status persistence]
| false
| true

| thresholding-enabled
| Whether collected response time should be tested against thresholds.
Expand Down
2 changes: 1 addition & 1 deletion features/mib-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bundle.symbolicName>org.opennms.features.mib-compiler</bundle.symbolicName>
<bundle.namespace>org.opennms.features</bundle.namespace>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsmiparser.version>0.13</jsmiparser.version>
<jsmiparser.version>0.14</jsmiparser.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@
<concurrentTreesVersion>2.6.1</concurrentTreesVersion>
<cronParserCoreVersion>3.5</cronParserCoreVersion>
<c3p0Version>0.9.5.5</c3p0Version>
<curatorVersion>3.2.1</curatorVersion>
<curatorVersion>5.5.0</curatorVersion>
<curatorTestVersion>5.5.0</curatorTestVersion>
<cxfVersion>3.5.5</cxfVersion>
<cxfXjcVersion>3.3.2</cxfXjcVersion>
Expand Down Expand Up @@ -1709,7 +1709,7 @@
<kafkaVersion>3.3.1</kafkaVersion>
<kotlinVersion>1.4.10</kotlinVersion>
<liquibaseVersion>3.6.3</liquibaseVersion>
<lmaxDisruptorVersion>3.3.2</lmaxDisruptorVersion>
<lmaxDisruptorVersion>3.4.4</lmaxDisruptorVersion>
<log4j2Version>2.20.0</log4j2Version>
<logbackClassicVersion>1.2.11</logbackClassicVersion>
<mapstructVersion>1.5.2.Final</mapstructVersion>
Expand Down

0 comments on commit 4cc8389

Please sign in to comment.