From 87c3a70042b5fe7eba7ad1d723df62333d9a2e3f Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 27 Jul 2023 16:00:23 -0400 Subject: [PATCH 001/186] skip vim droppings :) --- container/features/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container/features/pom.xml b/container/features/pom.xml index 13015404d647..a7b0c391c1d7 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -29,6 +29,11 @@ true + UTF-8 + \ + + swp + From ac599ef127339fd104c29bc95b3ff9eaa267f3a6 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 9 Jun 2023 15:46:42 -0400 Subject: [PATCH 002/186] NMS-15345: rebuild feature dependencies to ease testing --- features/minion/runInPlace.sh | 5 +++-- features/sentinel/runInPlace.sh | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/features/minion/runInPlace.sh b/features/minion/runInPlace.sh index 93732fdbc6a4..653461164c0f 100755 --- a/features/minion/runInPlace.sh +++ b/features/minion/runInPlace.sh @@ -12,6 +12,8 @@ JAVA_OPTS="-Xmx2g" export PATH CONTAINERDIR JAVA_OPTS +BUILD_PREREQUISITES="org.opennms.karaf:opennms,:org.opennms.container.shared,org.opennms.features.container:minion,org.opennms.features.minion:core-repository,org.opennms.features.minion:repository" + cleanup_and_build() { should_use_sudo=$1 @@ -39,8 +41,7 @@ cleanup_and_build() { $cmd_prefix rm -rf "${CONTAINERDIR}"/target/minion-karaf-* # Rebuild - we've already verified that we're in the right folder - compile.pl -DskipTests clean install && \ - (cd "${CONTAINERDIR}"; compile.pl -DskipTests clean install) + (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${BUILD_PREREQUISITES}" install) } set_instance_specific_configuration() { diff --git a/features/sentinel/runInPlace.sh b/features/sentinel/runInPlace.sh index fdda67f1152d..455ef14c905f 100755 --- a/features/sentinel/runInPlace.sh +++ b/features/sentinel/runInPlace.sh @@ -6,12 +6,14 @@ test -d repository || (echo "This command must be ran from the features/sentinel # Inclue the bundled Maven in the $PATH MYDIR=$(dirname "$0") MYDIR=$(cd "$MYDIR"; pwd) -PATH="$MYDIR/../../bin:$MYDIR/../../maven/bin:$PATH" +PATH="$MYDIR/../..:$MYDIR/../../bin:$MYDIR/../../maven/bin:$PATH" CONTAINERDIR="${MYDIR}/../container/sentinel" JAVA_OPTS="-Xmx2g" export PATH CONTAINERDIR JAVA_OPTS +BUILD_PREREQUISITES="org.opennms.karaf:opennms,:org.opennms.container.shared,org.opennms.features.sentinel:repository" + cleanup_and_build() { should_use_sudo=$1 @@ -39,8 +41,9 @@ cleanup_and_build() { $cmd_prefix rm -rf "${CONTAINERDIR}"/target/sentinel-karaf-* # Rebuild - we've already verified that we're in the right folder - mvn clean install && \ - (cd "${CONTAINERDIR}"; mvn clean install) + (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${REBUILD_PREREQUISITES}" install) && \ + compile.pl clean install && \ + (cd "${CONTAINERDIR}"; compile.pl clean install) } set_instance_specific_configuration() { From b0b645c3fc2c2121f07c0e835f0f550dab3ff826 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 9 Jun 2023 10:58:51 -0400 Subject: [PATCH 003/186] NMS-15345: normalize karaf-maven-plugin version/usage --- container/features/pom.xml | 2 -- container/karaf/pom.xml | 2 -- container/shared/pom.xml | 2 -- core/test-api/karaf/pom.xml | 1 - features/container/pom.xml | 12 ------------ features/minion/core/repository/pom.xml | 1 - features/minion/pom.xml | 12 ------------ features/minion/repository/pom.xml | 1 - features/sentinel/pom.xml | 10 ---------- features/sentinel/repository/pom.xml | 1 - opennms-full-assembly/pom.xml | 1 - pom.xml | 7 +++++++ 12 files changed, 7 insertions(+), 45 deletions(-) diff --git a/container/features/pom.xml b/container/features/pom.xml index a7b0c391c1d7..246ff5378b04 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -136,8 +136,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} - true ${skipTests} diff --git a/container/karaf/pom.xml b/container/karaf/pom.xml index c54f41c044d9..9b4dcc08529b 100644 --- a/container/karaf/pom.xml +++ b/container/karaf/pom.xml @@ -37,8 +37,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} - true diff --git a/container/shared/pom.xml b/container/shared/pom.xml index 458f873730c4..c01fc9ac9e81 100644 --- a/container/shared/pom.xml +++ b/container/shared/pom.xml @@ -38,8 +38,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} - true diff --git a/core/test-api/karaf/pom.xml b/core/test-api/karaf/pom.xml index 182c90f1ed15..b3c73a9a9233 100644 --- a/core/test-api/karaf/pom.xml +++ b/core/test-api/karaf/pom.xml @@ -59,7 +59,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} features-add-to-repository diff --git a/features/container/pom.xml b/features/container/pom.xml index 54c3f7c1878d..37e27bff55e8 100644 --- a/features/container/pom.xml +++ b/features/container/pom.xml @@ -14,16 +14,4 @@ minion sentinel - - - - - org.apache.karaf.tooling - karaf-maven-plugin - ${karafVersion} - true - - - - diff --git a/features/minion/core/repository/pom.xml b/features/minion/core/repository/pom.xml index 41275fcd1ca2..f97e4841c059 100644 --- a/features/minion/core/repository/pom.xml +++ b/features/minion/core/repository/pom.xml @@ -16,7 +16,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} features-add-to-repository diff --git a/features/minion/pom.xml b/features/minion/pom.xml index 2388d7ae49ef..5a32fc223dd9 100644 --- a/features/minion/pom.xml +++ b/features/minion/pom.xml @@ -20,16 +20,4 @@ dominion - - - - - org.apache.karaf.tooling - karaf-maven-plugin - ${karafVersion} - true - - - - diff --git a/features/minion/repository/pom.xml b/features/minion/repository/pom.xml index 754a77f26646..b5e59bc966b3 100644 --- a/features/minion/repository/pom.xml +++ b/features/minion/repository/pom.xml @@ -16,7 +16,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} features-add-to-repository diff --git a/features/sentinel/pom.xml b/features/sentinel/pom.xml index 36b5b5d9ad04..972758bd8919 100644 --- a/features/sentinel/pom.xml +++ b/features/sentinel/pom.xml @@ -31,15 +31,5 @@ - - - - org.apache.karaf.tooling - karaf-maven-plugin - ${karafVersion} - true - - - diff --git a/features/sentinel/repository/pom.xml b/features/sentinel/repository/pom.xml index ba637cadb6d9..a2b0a5ca48b9 100644 --- a/features/sentinel/repository/pom.xml +++ b/features/sentinel/repository/pom.xml @@ -16,7 +16,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} features-add-to-repository diff --git a/opennms-full-assembly/pom.xml b/opennms-full-assembly/pom.xml index ecd07d44af11..a40b4a99c1b6 100644 --- a/opennms-full-assembly/pom.xml +++ b/opennms-full-assembly/pom.xml @@ -185,7 +185,6 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karafVersion} diff --git a/pom.xml b/pom.xml index 9f67fc97e3b2..6e8a18ad8c5b 100644 --- a/pom.xml +++ b/pom.xml @@ -1351,6 +1351,12 @@ + + org.apache.karaf.tooling + karaf-maven-plugin + ${maven.karaf.plugin.version} + true + com.atlassian.maven.plugins maven-clover2-plugin @@ -1499,6 +1505,7 @@ 2.10 3.4.1 + 4.4.3 1.6.0 3.3.0 2.7.7 From c6cd70885256eac20932ed46882218a4621c535e Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 9 Jun 2023 11:06:19 -0400 Subject: [PATCH 004/186] NMS-15345: start some features early to ensure they are ready as soon as possible --- container/features/pom.xml | 3 +++ .../src/main/resources/features-minion.xml | 2 +- .../src/main/resources/features-sentinel.xml | 14 +++++++------- .../features/src/main/resources/features.xml | 18 +++++++++--------- .../src/main/resources/karaf-extensions.xml | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/container/features/pom.xml b/container/features/pom.xml index 246ff5378b04..094902575bd4 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -10,6 +10,9 @@ opennms pom OpenNMS :: OSGi Container :: Karaf Features + + 60 + diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 5036a1fb79a3..33f3d311e97a 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -129,7 +129,7 @@ mvn:org.opennms.features.minion.shell/org.opennms.features.minion.shell.collection/${project.version} - + netty4 opennms-dnsresolver-api dropwizard-metrics diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 072ec3f2b278..aa95a8f26538 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -97,7 +97,7 @@ mvn:org.opennms.features.distributed/org.opennms.features.distributed.dao-shell/${project.version} - + sentinel-timeseries-api netty4 @@ -127,7 +127,7 @@ mvn:org.opennms.features.telemetry.distributed/org.opennms.features.telemetry.distributed.sentinel/${project.version} - + guava sentinel-telemetry opennms-jest @@ -157,31 +157,31 @@ mvn:org.opennms.features.distributed/org.opennms.features.distributed.collection/${project.version} - + sentinel-telemetry opennms-telemetry-nxos mvn:org.opennms.features.distributed/org.opennms.features.distributed.collection/${project.version} - + sentinel-telemetry opennms-telemetry-jti mvn:org.opennms.features.distributed/org.opennms.features.distributed.collection/${project.version} - + sentinel-telemetry opennms-telemetry-graphite mvn:org.opennms.features.distributed/org.opennms.features.distributed.collection/${project.version} - + sentinel-telemetry opennms-telemetry-bmp-adapter mvn:org.opennms.features.distributed/org.opennms.features.distributed.collection/${project.version} - + sentinel-telemetry opennms-telemetry-bmp-adapter diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 25a47764decb..afcacc2d8da8 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -1036,7 +1036,7 @@ mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version} mvn:org.opennms.features.kafka/org.opennms.features.kafka.consumer/${project.version} - + guava netty4 dropwizard-metrics @@ -1056,7 +1056,7 @@ mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.shell/${project.version} - + netty4 camel-spring dropwizard-metrics @@ -1075,14 +1075,14 @@ mvn:org.opennms.features.telemetry.config/org.opennms.features.telemetry.config.jaxb/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.listeners/${project.version} - + opennms-telemetry-bmp-adapter rate-limited-logger resilience4j opennms-dnsresolver-api mvn:org.opennms.features.telemetry.protocols.bmp/org.opennms.features.telemetry.protocols.bmp.parser/${project.version} - + opennms-telemetry-collection opennms-kafka rate-limited-logger @@ -1096,21 +1096,21 @@ mvn:com.google.code.gson/gson/${jestGsonVersion} commons-net - + opennms-telemetry-collection mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.features.telemetry.protocols.jti/org.opennms.features.telemetry.protocols.jti.adapter/${project.version} - + opennms-telemetry-collection mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.features.telemetry.protocols.nxos/org.opennms.features.telemetry.protocols.nxos.adapter/${project.version} - + opennms-telemetry-collection mvn:org.opennms.features.telemetry.protocols.graphite/org.opennms.features.telemetry.protocols.graphite.adapter/${project.version} - + opennms-telemetry-collection opennms-telemetry-openconfig-client opennms-rpc-utils @@ -1162,7 +1162,7 @@ mvn:org.opennms.container/spring-extender/${project.version} mvn:org.opennms.features.distributed/org.opennms.features.distributed.serviceregistry/${project.version} - +
Feature definition to start all required bundles related to *flow-support.
opennms-health opennms-jest diff --git a/container/features/src/main/resources/karaf-extensions.xml b/container/features/src/main/resources/karaf-extensions.xml index 79921461a57c..18000a58f052 100644 --- a/container/features/src/main/resources/karaf-extensions.xml +++ b/container/features/src/main/resources/karaf-extensions.xml @@ -2,7 +2,7 @@ mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/core - + guava mvn:org.opennms.container/extender/${project.version} From 1dc7d4663bbee9de059e7b963afc8bfce366c2a6 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 15 Jun 2023 15:29:43 -0400 Subject: [PATCH 005/186] NMS-15345: normalize bouncycastle dependencies --- .../features/src/main/resources/features-core.xml | 14 ++++++++++---- container/features/src/main/resources/features.xml | 5 +---- pom.xml | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 5e80e818967e..a39b1c9e3a23 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -12,6 +12,14 @@ Karaf side. --> + + + mvn:org.bouncycastle/bcutil-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bcpkix-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bcprov-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bctls-jdk18on/${bouncyCastleVersion} + + guava jackson-core @@ -181,14 +189,12 @@ - shell + bouncycastle jaas + shell mvn:org.apache.sshd/sshd-osgi/${minaSshdVersion} mvn:org.apache.sshd/sshd-scp/${minaSshdVersion} mvn:org.apache.sshd/sshd-sftp/${minaSshdVersion} - mvn:org.bouncycastle/bcutil-jdk18on/1.72 - mvn:org.bouncycastle/bcprov-jdk18on/1.72 - mvn:org.bouncycastle/bcpkix-jdk18on/1.72 mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${karafVersion} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index afcacc2d8da8..5d68feddc464 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -67,9 +67,6 @@ wrap:mvn:org.apache.xmlgraphics/batik-util/${batikVersion} wrap:mvn:org.apache.xmlgraphics/batik-xml/${batikVersion} - - wrap:mvn:org.bouncycastle/bcprov-jdk15on/${bouncyCastleVersion} - wrap:mvn:bsf/bsf/${bsfVersion} @@ -225,7 +222,7 @@ mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipselinkVersion} - bcprov + bouncycastle mvn:eu.agno3.jcifs/jcifs-ng/${jcifsVersion} diff --git a/pom.xml b/pom.xml index 6e8a18ad8c5b..8d538695607b 100644 --- a/pom.xml +++ b/pom.xml @@ -1599,7 +1599,7 @@ 5.15.5 3.9.2 1.16 - 1.68 + 1.74 2.4.0 3.5.0 2.8.0 From 1e83c870a0e990849e7af7cc790f6510c501242b Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 15 Jun 2023 17:02:52 -0400 Subject: [PATCH 006/186] NMS-15345: bson -> features-core --- container/features/src/main/resources/features-core.xml | 4 ++++ container/features/src/main/resources/features-minion.xml | 4 ++-- container/features/src/main/resources/features-sentinel.xml | 4 ++-- container/features/src/main/resources/features.xml | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index a39b1c9e3a23..a3dd9b544874 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -20,6 +20,10 @@ mvn:org.bouncycastle/bctls-jdk18on/${bouncyCastleVersion} + + mvn:org.mongodb/bson/${bsonVersion} + + guava jackson-core diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 33f3d311e97a..75c218847e66 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -130,13 +130,13 @@ + bson + dropwizard-metrics netty4 opennms-dnsresolver-api - dropwizard-metrics opennms-util mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:com.google.code.gson/gson/${gsonVersion} - mvn:org.mongodb/bson/${bsonVersion} mvn:org.apache.commons/commons-csv/${commonsCsvVersion} wrap:mvn:io.pkts/pkts-core/${pktsVersion} wrap:mvn:io.pkts/pkts-buffers/${pktsVersion} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index aa95a8f26538..1f600a65226d 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -128,7 +128,9 @@ + bson guava + rate-limited-logger sentinel-telemetry opennms-jest opennms-integration-api @@ -136,7 +138,6 @@ opennms-dnsresolver-netty sentinel-kvstore-api opennms-kafka - rate-limited-logger mvn:com.google.protobuf/protobuf-java-util/${protobufVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.kafka-persistence/${project.version} wrap:mvn:org.apache.commons/commons-csv/${commonsCsvVersion} @@ -146,7 +147,6 @@ mvn:org.opennms.features.flows/org.opennms.features.flows.elastic/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.processing/${project.version} wrap:mvn:org.freemarker/freemarker/${freemarkerVersion} - mvn:org.mongodb/bson/${bsonVersion} mvn:org.opennms.core/org.opennms.core.cache/${project.version} mvn:org.opennms.features.telemetry.protocols.netflow/org.opennms.features.telemetry.protocols.netflow.transport/${project.version} mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.common/${project.version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 5d68feddc464..e8f6eb88182b 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -1161,6 +1161,7 @@
Feature definition to start all required bundles related to *flow-support.
+ bson opennms-health opennms-jest guava @@ -1175,7 +1176,6 @@ rate-limited-logger wrap:mvn:org.apache.commons/commons-csv/${commonsCsvVersion} mvn:org.apache.commons/commons-csv/${commonsCsvVersion} - mvn:org.mongodb/bson/${bsonVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version} mvn:org.opennms.features.flows.rest/org.opennms.features.flows.rest.api/${project.version} @@ -1186,7 +1186,6 @@ mvn:org.opennms.features.flows/org.opennms.features.flows.elastic/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.processing/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.kafka-persistence/${project.version} - mvn:org.mongodb/bson/${bsonVersion} mvn:org.opennms.core/org.opennms.core.cache/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.common/${project.version} From f75eb84bbeaae61d3abc7c23719ef82b5e6d9f00 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 15 Jun 2023 17:09:05 -0400 Subject: [PATCH 007/186] NMS-15345: move some commons-* dependencies to features-core --- .../src/main/resources/features-core.xml | 27 ++++++++++++++++++- .../features/src/main/resources/features.xml | 20 ++------------ .../src/main/resources/spring-legacy.xml | 4 +-- pom.xml | 3 ++- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index a3dd9b544874..31415cff9fa5 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -34,6 +34,31 @@ mvn:com.datastax.cassandra/cassandra-driver-core/${cassandraVersion} + + commons-collections + mvn:commons-beanutils/commons-beanutils/${commonsBeanutilsVersion} + + + + mvn:commons-cli/commons-cli/${commonsCliVersion} + + + + mvn:commons-codec/commons-codec/${commonsCodecVersion} + + + + mvn:commons-collections/commons-collections/${commonsCollectionsVersion} + + + + mvn:org.apache.commons/commons-compress/${commonsCompressVersion} + + + + mvn:org.apache.commons/commons-lang3/${commonsLang3Version} + + wrap wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 @@ -185,9 +210,9 @@ + commons-codec guava scv-api - mvn:commons-codec/commons-codec/${commonsCodecVersion} mvn:org.opennms.features.scv/org.opennms.features.scv.jceks-impl/${project.version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index e8f6eb88182b..89fbf5edc473 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -78,22 +78,6 @@ postgresql mvn:com.zaxxer/HikariCP/${hikaricpVersion} - - commons-collections - mvn:commons-beanutils/commons-beanutils/${commonsBeanutilsVersion} - - - mvn:commons-codec/commons-codec/${commonsCodecVersion} - - - mvn:commons-cli/commons-cli/1.2 - - - mvn:commons-collections/commons-collections/${commonsCollectionsVersion} - - - mvn:org.apache.commons/commons-compress/1.21 - commons-beanutils commons-codec @@ -187,9 +171,9 @@ wrap:mvn:org.dom4j/dom4j/${dom4jVersion} + commons-collections dom4j wrap:mvn:antlr/antlr/${antlr.version}$Import-Package=org.hibernate.hql.ast - mvn:commons-collections/commons-collections/${commonsCollectionsVersion} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:org.javassist/javassist/${javassistVersion} wrap:mvn:org.hibernate.javax.persistence/hibernate-jpa-2.0-api/1.0.1.Final @@ -1572,13 +1556,13 @@
Feature definition for Jest (ElasticSearch Java ReST Client)
+ commons-codec guava21 mvn:com.google.code.gson/gson/${jestGsonVersion} wrap:mvn:org.apache.httpcomponents/httpcore-nio/${httpcoreVersion} mvn:org.opennms.features.jest/org.opennms.features.jest.client/${project.version} mvn:io.searchbox/jest-complete-osgi/${jestVersion} - mvn:commons-codec/commons-codec/1.9 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcoreVersion} mvn:org.apache.httpcomponents/httpclient-osgi/${httpclientVersion} mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclientVersion} diff --git a/container/features/src/main/resources/spring-legacy.xml b/container/features/src/main/resources/spring-legacy.xml index 8b6e303149bd..36feafe20909 100644 --- a/container/features/src/main/resources/spring-legacy.xml +++ b/container/features/src/main/resources/spring-legacy.xml @@ -70,8 +70,8 @@ spring-web pax-web-war - mvn:commons-collections/commons-collections/3.2.2 - mvn:commons-beanutils/commons-beanutils/1.9.4 + mvn:commons-collections/commons-collections/${commonsCollectionsVersion} + mvn:commons-beanutils/commons-beanutils/${commonsBeanutilsVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1 diff --git a/pom.xml b/pom.xml index 8d538695607b..e37a1ae0aa95 100644 --- a/pom.xml +++ b/pom.xml @@ -1609,10 +1609,11 @@ 3.11.2 3.2.0 1.9.4 + 1.2 1.16.0 3.2.2 - 1.21 4.4 + 1.21 1.6 1.5 2.1 From 66014ec9cdd3ba74cce15cc13c164aec495c1242 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 21 Jun 2023 14:28:00 -0400 Subject: [PATCH 008/186] NMS-15345: move commons configuration, csv, digester, exec, and io to core --- .../src/main/resources/features-core.xml | 29 +++++++++++++++++++ .../src/main/resources/features-minion.xml | 2 +- .../src/main/resources/features-sentinel.xml | 2 +- .../features/src/main/resources/features.xml | 27 +---------------- pom.xml | 2 ++ 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 31415cff9fa5..df9979001b2c 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -55,6 +55,35 @@ mvn:org.apache.commons/commons-compress/${commonsCompressVersion} + + commons-beanutils + commons-codec + commons-digester + commons-jxpath + commons-lang + javax.mail + javax.servlet + wrap:mvn:org.apache.ant/ant/${antVersion} + mvn:commons-configuration/commons-configuration/${commonsConfigurationVersion} + + + + mvn:org.apache.commons/commons-csv/${commonsCsvVersion} + + + + commons-beanutils + mvn:commons-digester/commons-digester/${commonsDigesterVersion} + + + + mvn:org.apache.commons/commons-exec/${commonsExecVersion} + + + + mvn:commons-io/commons-io/${commonsIoVersion} + + mvn:org.apache.commons/commons-lang3/${commonsLang3Version} diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 75c218847e66..e78bdec73eeb 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -131,13 +131,13 @@ bson + commons-csv dropwizard-metrics netty4 opennms-dnsresolver-api opennms-util mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:com.google.code.gson/gson/${gsonVersion} - mvn:org.apache.commons/commons-csv/${commonsCsvVersion} wrap:mvn:io.pkts/pkts-core/${pktsVersion} wrap:mvn:io.pkts/pkts-buffers/${pktsVersion} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 1f600a65226d..9dfd3a1536ec 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -129,6 +129,7 @@ bson + commons-csv guava rate-limited-logger sentinel-telemetry @@ -140,7 +141,6 @@ opennms-kafka mvn:com.google.protobuf/protobuf-java-util/${protobufVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.kafka-persistence/${project.version} - wrap:mvn:org.apache.commons/commons-csv/${commonsCsvVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.impl/${project.version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 89fbf5edc473..4d738f1c4e03 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -78,27 +78,6 @@ postgresql mvn:com.zaxxer/HikariCP/${hikaricpVersion} - - commons-beanutils - commons-codec - commons-digester - commons-jxpath - commons-lang - javax.mail - javax.servlet - wrap:mvn:org.apache.ant/ant/1.8.2 - mvn:commons-configuration/commons-configuration/${commonsConfigurationVersion} - - - commons-beanutils - mvn:commons-digester/commons-digester/${commonsDigesterVersion} - - - mvn:org.apache.commons/commons-exec/1.2 - - - mvn:commons-io/commons-io/${commonsIoVersion} - mvn:org.apache.commons/commons-jexl/${commonsJexlVersion} @@ -112,9 +91,6 @@ mvn:commons-lang/commons-lang/${commonsLangVersion} - - mvn:org.apache.commons/commons-lang3/${commonsLang3Version} - mvn:commons-net/commons-net/${commonsNetVersion} @@ -1146,6 +1122,7 @@
Feature definition to start all required bundles related to *flow-support.
bson + commons-csv opennms-health opennms-jest guava @@ -1158,8 +1135,6 @@ opennms-dnsresolver-api opennms-kafka rate-limited-logger - wrap:mvn:org.apache.commons/commons-csv/${commonsCsvVersion} - mvn:org.apache.commons/commons-csv/${commonsCsvVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version} mvn:org.opennms.features.flows.rest/org.opennms.features.flows.rest.api/${project.version} diff --git a/pom.xml b/pom.xml index e37a1ae0aa95..3f78463b84f3 100644 --- a/pom.xml +++ b/pom.xml @@ -1594,6 +1594,7 @@ 2.4.8 + 1.10.13 2.33 5.0.4 5.15.5 @@ -1617,6 +1618,7 @@ 1.6 1.5 2.1 + 1.2 2.1.1 1.3 2.12.0 From d525f39d6c59f7018d0782dbb35433d877d926a8 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 21 Jun 2023 16:49:06 -0400 Subject: [PATCH 009/186] NMS-15345: move commons-jexl, commons-jxpath, and commons-lang to core --- .../src/main/resources/features-core.xml | 18 +++++++++++++++++- .../features/src/main/resources/features.xml | 13 ------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index df9979001b2c..e7954b80cab1 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -84,8 +84,24 @@ mvn:commons-io/commons-io/${commonsIoVersion} + + mvn:org.apache.commons/commons-jexl/${commonsJexlVersion} + + + + commons-beanutils + javax.servlet + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4 + wrap:mvn:javax.servlet.jsp/jsp-api/2.2 + mvn:commons-jxpath/commons-jxpath/${commonsJxpathVersion} + + + + mvn:commons-lang/commons-lang/${commonsLangVersion} + + - mvn:org.apache.commons/commons-lang3/${commonsLang3Version} + mvn:org.apache.commons/commons-lang3/${commonsLang3Version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 4d738f1c4e03..68202029841e 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -78,19 +78,6 @@ postgresql mvn:com.zaxxer/HikariCP/${hikaricpVersion} - - mvn:org.apache.commons/commons-jexl/${commonsJexlVersion} - - - commons-beanutils - javax.servlet - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4 - wrap:mvn:javax.servlet.jsp/jsp-api/2.2 - mvn:commons-jxpath/commons-jxpath/${commonsJxpathVersion} - - - mvn:commons-lang/commons-lang/${commonsLangVersion} - mvn:commons-net/commons-net/${commonsNetVersion} From 94e442fcce4f62d5f1ea1d9f987b2c425bf7b2d2 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 22 Jun 2023 11:13:33 -0400 Subject: [PATCH 010/186] NMS-15345: move commons-net, commons-pool2, and jackson1 to core --- .../src/main/resources/features-core.xml | 14 ++++++++++++ .../src/main/resources/features-sentinel.xml | 4 +--- .../features/src/main/resources/features.xml | 22 ++++++------------- pom.xml | 1 + 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index e7954b80cab1..0ec4fb8ac114 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -104,6 +104,14 @@ mvn:org.apache.commons/commons-lang3/${commonsLang3Version} + + mvn:commons-net/commons-net/${commonsNetVersion} + + + + mvn:org.apache.commons/commons-pool2/${commonsPool2Version} + + wrap wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 @@ -131,6 +139,12 @@ mvn:com.google.guava/guava/31.1-jre + + mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} + mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} + mvn:org.codehaus.jackson/jackson-xc/${jacksonVersion} + + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2Version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2Version} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 9dfd3a1536ec..ac642e77ccc5 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -270,13 +270,11 @@ + jackson1 resilience4j sentinel-kvstore-api opennms-config-dao-api mvn:org.opennms/org.opennms.config-dao.common-impl/${project.version} - mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-xc/${jacksonVersion} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 68202029841e..e4c30fccde93 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -78,9 +78,6 @@ postgresql mvn:com.zaxxer/HikariCP/${hikaricpVersion} - - mvn:commons-net/commons-net/${commonsNetVersion} - wrap:mvn:net.redhogs.cronparser/cron-parser-core/${cronParserCoreVersion} @@ -297,16 +294,14 @@ - spring - spring-orm commons-io dnsjava + jackson1 jaxb + spring + spring-orm opennms-util - wrap:mvn:javax.inject/javax.inject/1 - mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-xc/${jacksonVersion} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_3 mvn:org.opennms.core/org.opennms.core.api/${project.version} mvn:org.opennms.core/org.opennms.core.commands/${project.version} mvn:org.opennms.core/org.opennms.core.criteria/${project.version} @@ -822,15 +817,13 @@ commons-jxpath commons-lang guava + jackson1 joda-time opennms-core-web wrap:mvn:com.github.mwiede/jsch/${jschVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/1.0.6_1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/2.4_1 - mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-xc/${jacksonVersion} wrap:mvn:org.jsoup/jsoup/${jsoupVersion} mvn:org.opennms.protocols/org.opennms.protocols.xml/${project.version} mvn:org.opennms.features.distributed/org.opennms.features.distributed.kv-store.api/${project.version} @@ -1489,6 +1482,7 @@
OpenNMS is the world's first enterprise grade network management platform developed under the open source model. It consists of a community supported open-source project as well as a commercial services, training and support organization.
guava hibernate36 + jackson1 javax.servlet quartz opennms-dao @@ -1496,8 +1490,6 @@ wrap:mvn:org.freemarker/freemarker/${freemarkerVersion} mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${karafVersion} mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karafVersion} - mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} - mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} mvn:org.opennms/opennms-web-api/${project.version} mvn:org.freemarker/freemarker/${freemarkerVersion} mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.common/${project.version} @@ -1944,6 +1936,7 @@ + commons-pool2 groovy guava opennms-measurements-api @@ -1956,7 +1949,6 @@ wrap:mvn:com.googlecode.concurrent-trees/concurrent-trees/${concurrentTreesVersion} mvn:com.lmax/disruptor/${lmaxDisruptorVersion} wrap:mvn:com.swrve/rate-limited-logger/${rateLimitedLoggerVersion} - mvn:org.apache.commons/commons-pool2/2.4.2 mvn:redis.clients/jedis/2.8.1 mvn:args4j/args4j/${args4jVersion} diff --git a/pom.xml b/pom.xml index 3f78463b84f3..b8d3506499cf 100644 --- a/pom.xml +++ b/pom.xml @@ -1626,6 +1626,7 @@ 3.12.0 3.6.1 3.9.0 + 2.4.3 1.7 2.6.1 3.5 From 99dd1f016bb95623b8c27e597889b8a656bdbd50 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 22 Jun 2023 16:48:50 -0400 Subject: [PATCH 011/186] NMS-15345: move javax.mail, javax.servlet, and javax.validation to core --- .../src/main/resources/features-core.xml | 18 +++++++++++++++--- .../features/src/main/resources/features.xml | 9 --------- .../src/main/resources/spring-legacy.xml | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 0ec4fb8ac114..c86ca6ded50e 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -179,17 +179,29 @@ mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2Version} + + mvn:javax.mail/mail/${javaxMailVersion} + + + + mvn:javax.servlet/javax.servlet-api/${servletApiVersion} + + + + wrap:mvn:javax.validation/validation-api/1.0.0.GA$Bundle-SymbolicName=javax.validation:validation-api&Bundle-Version=1.0.0&Export-Package=javax.validation;version="1.0.0",javax.validation.bootstrap;version="1.0.0",javax.validation.constraints;version="1.0.0",javax.validation.groups;version="1.0.0",javax.validation.metadata;version="1.0.0",javax.validation.spi;version="1.0.0" + + pax-jetty + javax.mail + javax.servlet mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${karaf.servicemix.specs.version} - mvn:javax.servlet/javax.servlet-api/${servletApiVersion} - mvn:javax.mail/mail/${javaxMailVersion} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:javax.annotation/javax.annotation-api/1.3.2 - mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1 + mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2.4 mvn:org.apache.aries/org.apache.aries.util/1.1.3 mvn:org.eclipse.jetty/jetty-continuation/${jettyVersion} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index e4c30fccde93..1ea03b10210c 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -149,15 +149,6 @@ mvn:net.java.dev.jna/jna/${jnaVersion} mvn:net.java.dev.jna/jna-platform/${jnaVersion} - - mvn:javax.mail/mail/${javaxMailVersion} - - - mvn:javax.servlet/javax.servlet-api/${servletApiVersion} - - - wrap:mvn:javax.validation/validation-api/1.0.0.GA$Bundle-SymbolicName=javax.validation:validation-api&Bundle-Version=1.0.0&Export-Package=javax.validation;version="1.0.0",javax.validation.bootstrap;version="1.0.0",javax.validation.constraints;version="1.0.0",javax.validation.groups;version="1.0.0",javax.validation.metadata;version="1.0.0",javax.validation.spi;version="1.0.0" - javax.mail mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipselinkVersion} diff --git a/container/features/src/main/resources/spring-legacy.xml b/container/features/src/main/resources/spring-legacy.xml index 36feafe20909..dd2d4245dee8 100644 --- a/container/features/src/main/resources/spring-legacy.xml +++ b/container/features/src/main/resources/spring-legacy.xml @@ -100,7 +100,7 @@ spring - mvn:javax.servlet/javax.servlet-api/3.1.0 + mvn:javax.servlet/javax.servlet-api/${servletApiVersion} mvn:org.springframework/spring-web/3.1.4.RELEASE.ONMS.1 mvn:org.springframework/spring-webmvc/3.1.4.RELEASE osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1" @@ -331,7 +331,7 @@ spring - mvn:javax.servlet/javax.servlet-api/3.1.0 + mvn:javax.servlet/javax.servlet-api/${servletApiVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/4.3.30.RELEASE_1.ONMS.1 From 10f26d839f2695cb9564a10f2c3e38155e83a5d6 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 23 Jun 2023 13:27:55 -0400 Subject: [PATCH 012/186] NMS-15345: move dropwizard-metrics and fst to core --- .../src/main/resources/features-core.xml | 18 +++++++++++++++++- .../src/main/resources/features-minion.xml | 1 + .../src/main/resources/features-sentinel.xml | 1 + .../features/src/main/resources/features.xml | 15 ++++----------- features/wsman/pom.xml | 4 ++-- opennms-services/pom.xml | 4 ++-- pom.xml | 8 +++++--- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index c86ca6ded50e..a8dca733304e 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -25,10 +25,10 @@ + dropwizard-metrics guava jackson-core netty4 - mvn:io.dropwizard.metrics/metrics-core/${dropwizardMetricsVersion} mvn:com.github.jnr/jnr-ffi/2.1.7 mvn:com.github.jnr/jnr-posix/3.0.44 mvn:com.datastax.cassandra/cassandra-driver-core/${cassandraVersion} @@ -112,6 +112,19 @@ mvn:org.apache.commons/commons-pool2/${commonsPool2Version} + + mvn:io.dropwizard.metrics/metrics-core/${dropwizardMetricsVersion} + + + + + + jackson-core + mvn:org.javassist/javassist/${javassistVersion} + mvn:org.objenesis/objenesis/${objenesisVersion} + mvn:de.ruedigermoeller/fst/${fstVersion} + + wrap wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 @@ -126,14 +139,17 @@ mvn:com.google.guava/guava/${guavaVersion} + mvn:com.google.guava/guava/17.0 + mvn:com.google.guava/guava/21.0 + guava-dependencies mvn:com.google.guava/guava/31.1-jre diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index e78bdec73eeb..46e1bd80e4fe 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -158,6 +158,7 @@ + dropwizard-metrics opennms-core-ipc-sink-api opennms-core-ipc-rpc-api mvn:org.opennms.core.grpc/org.opennms.core.grpc.osgi/${project.version} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index ac642e77ccc5..ad3ff0d930e7 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -130,6 +130,7 @@ bson commons-csv + dropwizard-metrics guava rate-limited-logger sentinel-telemetry diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 1ea03b10210c..e467db34daac 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -84,9 +84,6 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjavaVersion} - - mvn:io.dropwizard.metrics/metrics-core/${dropwizardMetricsVersion} - wrap:mvn:org.apache.xmlgraphics/fop/${fopVersion} wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/${xmlgraphicsCommonsVersion} @@ -486,6 +483,7 @@ camel-blueprint camel-jms + dropwizard-metrics org.json javax.mail opennms-core-camel @@ -1094,6 +1092,7 @@
Feature definition to start all required bundles related to *flow-support.
bson commons-csv + dropwizard-metrics opennms-health opennms-jest guava @@ -1617,6 +1616,7 @@ + dropwizard-metrics opennms-core-ipc-sink-api opennms-identity opennms-core-ipc-rpc-api @@ -1897,6 +1897,7 @@ + dropwizard-metrics opennms-health opennms-measurements-api opennms-collection-api @@ -1918,14 +1919,6 @@ mvn:org.opennms.features/inmemory-timeseries-plugin/${project.version} - - - jackson-core - mvn:org.javassist/javassist/${javassistVersion} - mvn:org.objenesis/objenesis/2.4 - mvn:de.ruedigermoeller/fst/${fstVersion} - - commons-pool2 groovy diff --git a/features/wsman/pom.xml b/features/wsman/pom.xml index dc6cf81abee8..6eba362f3ccb 100644 --- a/features/wsman/pom.xml +++ b/features/wsman/pom.xml @@ -89,11 +89,11 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on diff --git a/opennms-services/pom.xml b/opennms-services/pom.xml index f5acd7499ab8..c2117978828f 100644 --- a/opennms-services/pom.xml +++ b/opennms-services/pom.xml @@ -278,11 +278,11 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on diff --git a/pom.xml b/pom.xml index b8d3506499cf..97de4049d841 100644 --- a/pom.xml +++ b/pom.xml @@ -1649,7 +1649,9 @@ 3.0.4 2.8 2.3.32 - 2.47 + 2.57 + + 2.5.1 1.4.0 2.15.0 1.1.1 @@ -5196,12 +5198,12 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncyCastleVersion} org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${bouncyCastleVersion} From fd50cd31b797af37b929f91046304aa804d99a55 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 27 Jul 2023 09:45:49 -0400 Subject: [PATCH 013/186] NMS-15345: move jna to the core --- container/features/src/main/resources/features-core.xml | 5 +++++ container/features/src/main/resources/features.xml | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index a8dca733304e..b46bf5ecfa5d 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -211,6 +211,11 @@ pax-jetty + + mvn:net.java.dev.jna/jna/${jnaVersion} + mvn:net.java.dev.jna/jna-platform/${jnaVersion} + + javax.mail javax.servlet diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index e467db34daac..fab0fc1ed45b 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -142,10 +142,6 @@ wrap:mvn:org.hibernate/hibernate-validator-annotation-processor/4.1.0.Final wrap:mvn:org.hibernate/hibernate-validator/4.1.0.Final - - mvn:net.java.dev.jna/jna/${jnaVersion} - mvn:net.java.dev.jna/jna-platform/${jnaVersion} - javax.mail mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipselinkVersion} From d582248dcb4d06e4976bd7ba333927a85f911d8b Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 27 Jul 2023 13:02:35 -0400 Subject: [PATCH 014/186] NMS-15345: define some common start levels, and normalize start-level= overrides to use them --- container/features/pom.xml | 2 + .../src/main/resources/features-core.xml | 34 +++++++------- .../features/src/main/resources/features.xml | 44 +++++++++---------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/container/features/pom.xml b/container/features/pom.xml index 094902575bd4..06bffd7451d5 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -11,7 +11,9 @@ pom OpenNMS :: OSGi Container :: Karaf Features + 30 60 + 100 diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index b46bf5ecfa5d..a5bc3b917b47 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -14,10 +14,10 @@ - mvn:org.bouncycastle/bcutil-jdk18on/${bouncyCastleVersion} - mvn:org.bouncycastle/bcpkix-jdk18on/${bouncyCastleVersion} - mvn:org.bouncycastle/bcprov-jdk18on/${bouncyCastleVersion} - mvn:org.bouncycastle/bctls-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bcutil-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bcpkix-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bcprov-jdk18on/${bouncyCastleVersion} + mvn:org.bouncycastle/bctls-jdk18on/${bouncyCastleVersion} @@ -127,16 +127,16 @@ wrap - wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 - wrap:mvn:com.google.errorprone/error_prone_annotations/2.10.0 - wrap:mvn:com.google.guava/failureaccess/1.0.1 - wrap:mvn:org.checkerframework/checker-qual/2.0.0 - wrap:mvn:com.google.j2objc/j2objc-annotations/1.1 + wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 + wrap:mvn:com.google.errorprone/error_prone_annotations/2.10.0 + wrap:mvn:com.google.guava/failureaccess/1.0.1 + wrap:mvn:org.checkerframework/checker-qual/2.0.0 + wrap:mvn:com.google.j2objc/j2objc-annotations/1.1 guava-dependencies - mvn:com.google.guava/guava/${guavaVersion} + mvn:com.google.guava/guava/${guavaVersion} @@ -152,7 +152,7 @@ guava-dependencies - mvn:com.google.guava/guava/31.1-jre + mvn:com.google.guava/guava/31.1-jre @@ -196,11 +196,11 @@ - mvn:javax.mail/mail/${javaxMailVersion} + mvn:javax.mail/mail/${javaxMailVersion} - mvn:javax.servlet/javax.servlet-api/${servletApiVersion} + mvn:javax.servlet/javax.servlet-api/${servletApiVersion} @@ -313,9 +313,9 @@ bouncycastle jaas shell - mvn:org.apache.sshd/sshd-osgi/${minaSshdVersion} - mvn:org.apache.sshd/sshd-scp/${minaSshdVersion} - mvn:org.apache.sshd/sshd-sftp/${minaSshdVersion} - mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${karafVersion} + mvn:org.apache.sshd/sshd-osgi/${minaSshdVersion} + mvn:org.apache.sshd/sshd-scp/${minaSshdVersion} + mvn:org.apache.sshd/sshd-sftp/${minaSshdVersion} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${karafVersion} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index fab0fc1ed45b..f22c30a98c5c 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -13,7 +13,7 @@ mvn:org.opennms.newts/newts-karaf/${newtsVersion}/xml/features - mvn:org.apache.qpid/proton-j/0.34.0 + mvn:org.apache.qpid/proton-j/0.34.0 camel-core camel-blueprint camel-http @@ -742,7 +742,7 @@ cxf-jaxws javax.servlet - mvn:org.codehaus.jettison/jettison/${jettisonVersion} + mvn:org.codehaus.jettison/jettison/${jettisonVersion} mvn:org.opennms.features.ticketing/org.opennms.features.ticketing.api/${project.version} mvn:org.opennms.features/opennms-integration-tsrm/${project.version} @@ -772,7 +772,7 @@ opennms-provisioning-api opennms-dao-api - mvn:org.codehaus.jettison/jettison/${jettisonVersion} + mvn:org.codehaus.jettison/jettison/${jettisonVersion} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${karaf.servicemix.specs.version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${karaf.servicemix.specs.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xercesVersion}_1 @@ -1051,7 +1051,7 @@ mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.telemetry-client/${project.version} - mvn:org.opennms.features/org.opennms.features.karaf-health/${project.version} + mvn:org.opennms.features/org.opennms.features.karaf-health/${project.version} commons-io @@ -1153,8 +1153,8 @@
OpenNMS is the world's first enterprise grade network management platform developed under the open source model. It consists of a community supported open-source project as well as a commercial services, training and support organization.
mvn:org.opennms.container/org.opennms.container.jaas-login-module/${project.version} - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${karafVersion} - mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${karafVersion} + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${karafVersion} + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${karafVersion} guava @@ -1196,7 +1196,7 @@
OpenNMS is the world's first enterprise grade network management platform developed under the open source model. It consists of a community supported open-source project as well as a commercial services, training and support organization.
mvn:org.opennms.features.bsm/org.opennms.features.bsm.shell-commands/${project.version} mvn:org.opennms.features.bsm/org.opennms.features.bsm.service.api/${project.version} - mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karafVersion} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karafVersion}
OpenNMS is the world's first enterprise grade network management platform developed under the open source model. It consists of a community supported open-source project as well as a commercial services, training and support organization.
@@ -1211,14 +1211,14 @@
OpenNMS is the world's first enterprise grade network management platform developed under the open source model. It consists of a community supported open-source project as well as a commercial services, training and support organization.
guava opennms-core-web - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.api/${project.version} - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.rest/${project.version} - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.service/${project.version} - mvn:org.opennms.features.geolocation/org.opennms.features.geolocation.api/${project.version} - mvn:org.opennms.features.geolocation/org.opennms.features.geolocation.services/${project.version} - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.google/${project.version} - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.mapquest/${project.version} - mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.nominatim/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.api/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.rest/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.service/${project.version} + mvn:org.opennms.features.geolocation/org.opennms.features.geolocation.api/${project.version} + mvn:org.opennms.features.geolocation/org.opennms.features.geolocation.services/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.google/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.mapquest/${project.version} + mvn:org.opennms.features.geocoder/org.opennms.features.geocoder.nominatim/${project.version}
OpenNMS Vaadin Administration UI for handling SNMP related configuration files for events and data collection.
@@ -1287,7 +1287,7 @@ mvn:org.jsoup/jsoup/${vaadinJsoupVersion} mvn:org.json/json/${jsonVersion} - mvn:com.vaadin/vaadin-shared/${vaadinVersion} + mvn:com.vaadin/vaadin-shared/${vaadinVersion} mvn:com.vaadin/vaadin-server/${vaadinVersion} mvn:com.vaadin/vaadin-client/${vaadinVersion} mvn:com.vaadin/vaadin-client-compiled/${vaadinVersion} @@ -1474,8 +1474,8 @@ opennms-dao mvn:org.opennms.features/datachoices/${project.version} wrap:mvn:org.freemarker/freemarker/${freemarkerVersion} - mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${karafVersion} - mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karafVersion} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${karafVersion} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karafVersion} mvn:org.opennms/opennms-web-api/${project.version} mvn:org.freemarker/freemarker/${freemarkerVersion} mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.common/${project.version} @@ -1757,12 +1757,12 @@ - mvn:javax.servlet/javax.servlet-api/3.1.0 - mvn:org.apache.felix/org.apache.felix.http.bridge/${felixBridgeVersion} + mvn:javax.servlet/javax.servlet-api/3.1.0 + mvn:org.apache.felix/org.apache.felix.http.bridge/${felixBridgeVersion} http-service;provider:=pax-http webconsole - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.http/${karafVersion} + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.http/${karafVersion} @@ -1882,7 +1882,7 @@ cxf-core cxf-jaxrs - mvn:org.codehaus.jettison/jettison/${jettisonVersion} + mvn:org.codehaus.jettison/jettison/${jettisonVersion} mvn:org.opennms.core.health/org.opennms.core.health.rest-cxf/${project.version} From f608f81acd15159d58810cd41e69f8a84f7a5835 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 27 Jul 2023 15:31:03 -0400 Subject: [PATCH 015/186] NMS-15345: introduce validation, clean up some dependencies as a result --- container/features/pom.xml | 53 +++++++++++++++++++ .../src/main/resources/features-core.xml | 12 +++-- .../src/main/resources/features-minion.xml | 2 +- .../src/main/resources/features-sentinel.xml | 2 +- .../features/src/main/resources/features.xml | 12 +++-- features/newts/pom.xml | 11 ++++ pom.xml | 2 +- 7 files changed, 83 insertions(+), 11 deletions(-) diff --git a/container/features/pom.xml b/container/features/pom.xml index 06bffd7451d5..7b949ce9163f 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -174,6 +174,59 @@ eventadmin + + bouncycastle + bson + + + minion-api-layer sentinel-api-layer sentinel-timeseries-api diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index a5bc3b917b47..ab7bb534fc7a 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -26,9 +26,9 @@ dropwizard-metrics - guava + guava18 jackson-core - netty4 + netty mvn:com.github.jnr/jnr-ffi/2.1.7 mvn:com.github.jnr/jnr-posix/3.0.44 mvn:com.datastax.cassandra/cassandra-driver-core/${cassandraVersion} @@ -144,6 +144,11 @@ mvn:com.google.guava/guava/17.0 + + + mvn:com.google.guava/guava/18.0 + + mvn:com.google.guava/guava/21.0 @@ -260,7 +265,8 @@ - + + bouncycastle mvn:io.netty/netty-buffer/${netty4Version} mvn:io.netty/netty-codec/${netty4Version} mvn:io.netty/netty-codec-dns/${netty4Version} diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 46e1bd80e4fe..97fadf4016cb 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -133,7 +133,7 @@ bson commons-csv dropwizard-metrics - netty4 + netty opennms-dnsresolver-api opennms-util mvn:com.google.protobuf/protobuf-java/${protobufVersion} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index ad3ff0d930e7..4e857341e81e 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -100,7 +100,7 @@ sentinel-timeseries-api - netty4 + netty dropwizard-metrics camel-spring diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index f22c30a98c5c..363a78636d73 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -960,7 +960,7 @@ guava - netty4 + netty dropwizard-metrics opennms-collection-api opennms-thresholding-api @@ -979,7 +979,7 @@ - netty4 + netty camel-spring dropwizard-metrics opennms-core-daemon @@ -1092,7 +1092,7 @@ opennms-health opennms-jest guava - netty4 + netty quartz opennms-core-tracing opennms-distributed-core-api @@ -1559,7 +1559,7 @@ guava dropwizard-metrics dnsjava - netty4 + netty resilience4j opennms-events-api opennms-model @@ -1894,6 +1894,8 @@ dropwizard-metrics + guava + fst opennms-health opennms-measurements-api opennms-collection-api @@ -1918,7 +1920,7 @@ commons-pool2 groovy - guava + guava opennms-measurements-api opennms-collection-api opennms-dao-api diff --git a/features/newts/pom.xml b/features/newts/pom.xml index e9d3f514f72a..c5469e904a12 100644 --- a/features/newts/pom.xml +++ b/features/newts/pom.xml @@ -21,6 +21,10 @@ JavaSE-1.8 ${project.groupId}.${project.artifactId} ${project.version} + + com.google.common.*;version="[18.0,26)", + * + @@ -56,6 +60,13 @@ newts-dependencies pom + + + com.google.guava + guava + 18.0 + provided + com.googlecode.concurrent-trees concurrent-trees diff --git a/pom.xml b/pom.xml index 97de4049d841..7526aecb1b8c 100644 --- a/pom.xml +++ b/pom.xml @@ -1734,7 +1734,7 @@ 2.2.2 3.12.4 3.10.6.Final - 4.1.87.Final + 4.1.95.Final 1.5.7 4.13.1 2.0.14 From a5a259bf4f48f7e0761846eb6b73bd14916c0225 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 27 Jul 2023 16:38:30 -0400 Subject: [PATCH 016/186] NMS-15345: more validation, clean up some failed dependencies --- container/features/pom.xml | 15 ++++++++--- .../src/main/resources/features-core.xml | 4 +-- .../src/main/resources/features-minion.xml | 1 + .../features/src/main/resources/features.xml | 25 +++++++++++++------ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/container/features/pom.xml b/container/features/pom.xml index 7b949ce9163f..3314d2c83663 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -177,7 +177,6 @@ bouncycastle bson - + opennms-health + opennms-health-api + opennms-newts + opennms-timeseries-api + + minion-api-layer + minion-heartbeat-producer + minion-snmp-proxy + opennms-dao-minion + opennms-trapd-listener + sentinel-api-layer sentinel-timeseries-api - opennms-timseries-api - opennms-newts file:${project.build.directory}/apache-karaf-${karafVersion}/etc/config.properties diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index ab7bb534fc7a..84bf51b313c8 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -160,7 +160,7 @@ mvn:com.google.guava/guava/31.1-jre - + mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} mvn:org.codehaus.jackson/jackson-xc/${jacksonVersion} @@ -227,7 +227,7 @@ mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${karaf.servicemix.specs.version} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:javax.annotation/javax.annotation-api/1.3.2 - + mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1 mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2.4 mvn:org.apache.aries/org.apache.aries.util/1.1.3 mvn:org.eclipse.jetty/jetty-continuation/${jettyVersion} diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 97fadf4016cb..be359d2a2e78 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -28,6 +28,7 @@ guava + minion-api-layer minion-core-api opennms-core opennms-core-ipc-sink-api diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 363a78636d73..e9da5422e916 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -274,6 +274,8 @@ owasp-html-sanitizer commons-jexl mvn:org.opennms.core/org.opennms.core.api/${project.version} + mvn:org.opennms.core/org.opennms.core.soa/${project.version} + mvn:org.opennms.core/org.opennms.core.sysprops/${project.version} mvn:org.opennms/opennms-util/${project.version} @@ -404,6 +406,7 @@ opennms-poller-api opennms-rrd-api opennms-snmp + scv-api mvn:org.opennms.core.mate/org.opennms.core.mate.api/${project.version} wrap:mvn:com.googlecode.concurrent-locks/concurrent-locks/1.0.0 wrap:mvn:org.jasypt/jasypt/${jasyptVersion} @@ -483,9 +486,10 @@ org.json javax.mail opennms-core-camel - opennms-distributed-core-api - opennms-dao-api opennms-core-tracing + opennms-dao-api + opennms-distributed-core-api + opennms-health-api opennms-rpc-utils wrap:mvn:ch.hsr/geohash/${geohashVersion} mvn:org.opennms.core.ipc.rpc/org.opennms.core.ipc.rpc.api/${project.version} @@ -736,6 +740,7 @@ opennms-events-api opennms-snmp opennms-core-ipc-sink-api + opennms-core-ipc-twin-common mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version} @@ -1050,16 +1055,16 @@ mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.common/${project.version} mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.telemetry-client/${project.version} - - mvn:org.opennms.features/org.opennms.features.karaf-health/${project.version} + + commons-lang3 + mvn:io.vavr/vavr/0.10.0 + mvn:org.opennms.core.health/org.opennms.core.health.api/${project.version} - + commons-io - commons-lang3 dropwizard-metrics + opennms-health-api opennms-util - mvn:io.vavr/vavr/0.10.0 - mvn:org.opennms.core.health/org.opennms.core.health.api/${project.version} mvn:org.opennms.core.health/org.opennms.core.health.impl/${project.version} mvn:org.opennms.core.health/org.opennms.core.health.shell/${project.version} @@ -1067,6 +1072,9 @@ opennms-health mvn:org.opennms.core.health/org.opennms.core.health.rest/${project.version} + + mvn:org.opennms.features/org.opennms.features.karaf-health/${project.version} + opennms-model opennms-dao @@ -1471,6 +1479,7 @@ jackson1 javax.servlet quartz + opennms-health-api opennms-dao mvn:org.opennms.features/datachoices/${project.version} wrap:mvn:org.freemarker/freemarker/${freemarkerVersion} From 0d4c30c9789874ce50a1d9d0cb78b5ec36ac36c8 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 28 Jul 2023 09:28:12 -0400 Subject: [PATCH 017/186] NMS-15345: avoid a race condition in websocket extensions we do not use --- container/features/pom.xml | 6 ++ .../src/main/resources/features-core.xml | 1 + .../src/main/resources/features-minion.xml | 1 + .../src/main/resources/features-sentinel.xml | 3 + container/noop-jetty-extension/pom.xml | 43 ++++++++++ .../jetty/extensions/noop/NoopExtension.java | 86 +++++++++++++++++++ .../OSGI-INF/blueprint/blueprint.xml | 8 ++ container/pom.xml | 1 + 8 files changed, 149 insertions(+) create mode 100644 container/noop-jetty-extension/pom.xml create mode 100644 container/noop-jetty-extension/src/main/java/org/opennms/container/jetty/extensions/noop/NoopExtension.java create mode 100644 container/noop-jetty-extension/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/container/features/pom.xml b/container/features/pom.xml index 3314d2c83663..677f1dd58348 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -279,6 +279,12 @@ ${project.version} provided + + org.opennms.container + noop-jetty-extension + ${project.version} + provided + org.opennms.container spring-extender diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 84bf51b313c8..7ee25deca204 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -224,6 +224,7 @@ javax.mail javax.servlet + mvn:org.opennms.container/noop-jetty-extension/${project.version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${karaf.servicemix.specs.version} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:javax.annotation/javax.annotation-api/1.3.2 diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index be359d2a2e78..ed266635f8b8 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -195,6 +195,7 @@ mvn:io.vavr/vavr/0.10.0 commons-lang3 mvn:org.opennms.features.minion/health-check/${project.version} + mvn:org.opennms.container/noop-jetty-extension/${project.version} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 4e857341e81e..9e4bab4e04f6 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -80,6 +80,9 @@ mvn:org.opennms.core/org.opennms.core.sysprops/${project.version} + + + mvn:org.opennms.container/noop-jetty-extension/${project.version} diff --git a/container/noop-jetty-extension/pom.xml b/container/noop-jetty-extension/pom.xml new file mode 100644 index 000000000000..28b25a44124c --- /dev/null +++ b/container/noop-jetty-extension/pom.xml @@ -0,0 +1,43 @@ + + + + org.opennms + org.opennms.container + 31.0.3-SNAPSHOT + + 4.0.0 + org.opennms.container + noop-jetty-extension + bundle + OpenNMS :: Container :: NOOP Jetty Extension + This bundle exists to work around a race condition with Jetty 9.4 startup. + + + + org.apache.felix + maven-bundle-plugin + true + + + JavaSE-11 + ${project.artifactId} + ${project.version} + + org.osgi.*, + *;resolution:=optional + + + + + + + + + org.eclipse.jetty.websocket + websocket-api + ${jettyVersion} + provided + + + diff --git a/container/noop-jetty-extension/src/main/java/org/opennms/container/jetty/extensions/noop/NoopExtension.java b/container/noop-jetty-extension/src/main/java/org/opennms/container/jetty/extensions/noop/NoopExtension.java new file mode 100644 index 000000000000..02a60ac36a3c --- /dev/null +++ b/container/noop-jetty-extension/src/main/java/org/opennms/container/jetty/extensions/noop/NoopExtension.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.container.jetty.extensions.noop; + +import org.eclipse.jetty.websocket.api.BatchMode; +import org.eclipse.jetty.websocket.api.WriteCallback; +import org.eclipse.jetty.websocket.api.extensions.Extension; +import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; +import org.eclipse.jetty.websocket.api.extensions.Frame; +import org.eclipse.jetty.websocket.api.extensions.IncomingFrames; +import org.eclipse.jetty.websocket.api.extensions.OutgoingFrames; + +public class NoopExtension implements Extension { + + @Override + public void incomingFrame(final Frame frame) { + // do nothing + } + + @Override + public void outgoingFrame(final Frame frame, final WriteCallback cb, final BatchMode mode) { + // do nothing + } + + @Override + public ExtensionConfig getConfig() { + return new ExtensionConfig("noop"); + } + + @Override + public String getName() { + return "noop"; + } + + @Override + public boolean isRsv1User() { + return false; + } + + @Override + public boolean isRsv2User() { + return false; + } + + @Override + public boolean isRsv3User() { + return false; + } + + @Override + public void setNextIncomingFrames(final IncomingFrames frames) { + // do nothing + } + + @Override + public void setNextOutgoingFrames(final OutgoingFrames frames) { + // do nothing + } + +} \ No newline at end of file diff --git a/container/noop-jetty-extension/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/container/noop-jetty-extension/src/main/resources/OSGI-INF/blueprint/blueprint.xml new file mode 100644 index 000000000000..0289e603de58 --- /dev/null +++ b/container/noop-jetty-extension/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/container/pom.xml b/container/pom.xml index 87236a6fe538..1ad439e22cd4 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -19,5 +19,6 @@ extender spring-extender shared + noop-jetty-extension From ad9b446add2810e507b145104b5c5307b365d523 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 31 Jul 2023 15:15:17 -0400 Subject: [PATCH 018/186] NMS-15345: update asm to 9.5 --- .../src/main/resources/features-core.xml | 8 ++++++ .../etc/blacklisted.properties | 3 +++ .../etc/overrides.properties | 6 +++++ .../etc/blacklisted.properties | 3 +++ .../etc/overrides.properties | 6 +++++ .../ticketing/otrs-integration-31/pom.xml | 10 +++++++- pom.xml | 25 +++++++++++++++++-- protocols/selenium-monitor/pom.xml | 10 +++++++- 8 files changed, 67 insertions(+), 4 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 7ee25deca204..632b4b4df96c 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -12,6 +12,14 @@ Karaf side. --> + + mvn:org.ow2.asm/asm/${asmVersion} + mvn:org.ow2.asm/asm-analysis/${asmVersion} + mvn:org.ow2.asm/asm-commons/${asmVersion} + mvn:org.ow2.asm/asm-tree/${asmVersion} + mvn:org.ow2.asm/asm-util/${asmVersion} + + mvn:org.bouncycastle/bcutil-jdk18on/${bouncyCastleVersion} diff --git a/container/karaf/src/main/filtered-resources/etc/blacklisted.properties b/container/karaf/src/main/filtered-resources/etc/blacklisted.properties index 72fd15acc545..e5a252c691db 100644 --- a/container/karaf/src/main/filtered-resources/etc/blacklisted.properties +++ b/container/karaf/src/main/filtered-resources/etc/blacklisted.properties @@ -13,3 +13,6 @@ http-whiteboard pax-http pax-http-whiteboard pax-war + +# asm-all doesn't exist anymore, use asm/asm-commons/etc. +org.ow2.asm:asm-all diff --git a/container/karaf/src/main/filtered-resources/etc/overrides.properties b/container/karaf/src/main/filtered-resources/etc/overrides.properties index 843d870c324e..a98e731a7c44 100644 --- a/container/karaf/src/main/filtered-resources/etc/overrides.properties +++ b/container/karaf/src/main/filtered-resources/etc/overrides.properties @@ -16,3 +16,9 @@ mvn:org.apache.sshd/sshd-osgi/${minaSshdVersion} mvn:org.apache.sshd/sshd-scp/${minaSshdVersion} mvn:org.apache.sshd/sshd-sftp/${minaSshdVersion} mvn:org.codehaus.jettison/jettison/${jettisonVersion} + +mvn:org.ow2.asm/asm/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-analysis/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-commons/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-tree/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-util/${asmVersion};range=[5,10) diff --git a/container/shared/src/main/filtered-resources/etc/blacklisted.properties b/container/shared/src/main/filtered-resources/etc/blacklisted.properties index 898257873883..b651fd98a5c4 100644 --- a/container/shared/src/main/filtered-resources/etc/blacklisted.properties +++ b/container/shared/src/main/filtered-resources/etc/blacklisted.properties @@ -7,3 +7,6 @@ mvn:org.apache.karaf.features/spring-legacy # we use the 4.3.9 version instead ssh/${karafVersion} + +# asm-all doesn't exist anymore, use asm/asm-commons/etc. +org.ow2.asm:asm-all diff --git a/container/shared/src/main/filtered-resources/etc/overrides.properties b/container/shared/src/main/filtered-resources/etc/overrides.properties index 642d98febb53..454bc53c5e1b 100644 --- a/container/shared/src/main/filtered-resources/etc/overrides.properties +++ b/container/shared/src/main/filtered-resources/etc/overrides.properties @@ -44,3 +44,9 @@ mvn:org.eclipse.jetty.websocket/websocket-client/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-common/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-server/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-servlet/${jettyVersion};range=[9.4,10) + +mvn:org.ow2.asm/asm/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-analysis/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-commons/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-tree/${asmVersion};range=[5,10) +mvn:org.ow2.asm/asm-util/${asmVersion};range=[5,10) diff --git a/features/ticketing/otrs-integration-31/pom.xml b/features/ticketing/otrs-integration-31/pom.xml index 541c97fa52f3..862782811975 100644 --- a/features/ticketing/otrs-integration-31/pom.xml +++ b/features/ticketing/otrs-integration-31/pom.xml @@ -130,7 +130,15 @@ org.ow2.asm - asm-all + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-util commons-beanutils diff --git a/pom.xml b/pom.xml index 7526aecb1b8c..56d240fda668 100644 --- a/pom.xml +++ b/pom.xml @@ -1138,6 +1138,7 @@ xml-apis:xml-apis asm:* + org.ow2.asm:asm-all bouncycastle:* c3p0:c3p0 commons-logging:* @@ -1596,7 +1597,7 @@ 2.4.8 1.10.13 2.33 - 5.0.4 + 9.5 5.15.5 3.9.2 1.16 @@ -3587,7 +3588,27 @@ org.ow2.asm - asm-all + asm + ${asmVersion} + + + org.ow2.asm + asm-analysis + ${asmVersion} + + + org.ow2.asm + asm-commons + ${asmVersion} + + + org.ow2.asm + asm-tree + ${asmVersion} + + + org.ow2.asm + asm-util ${asmVersion} diff --git a/protocols/selenium-monitor/pom.xml b/protocols/selenium-monitor/pom.xml index f388544b4bf5..c94cac26e743 100644 --- a/protocols/selenium-monitor/pom.xml +++ b/protocols/selenium-monitor/pom.xml @@ -178,7 +178,15 @@ org.ow2.asm - asm-all + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-util org.slf4j From 0b33f2b0e4d42ecd5eb2d6bd70a34b358cb7a19a Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 31 Jul 2023 13:13:42 -0400 Subject: [PATCH 019/186] NMS-15345: update spifly, get rid of jaspi --- .../src/main/resources/features-core.xml | 7 ++--- .../etc/blacklisted.properties | 5 ++++ .../etc/overrides.properties | 29 +++++++++++++++++++ .../etc/blacklisted.properties | 5 ++++ .../etc/overrides.properties | 2 +- pom.xml | 1 + 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 632b4b4df96c..1622fd38bf4c 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -230,19 +230,19 @@ + + asm javax.mail javax.servlet mvn:org.opennms.container/noop-jetty-extension/${project.version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${karaf.servicemix.specs.version} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:javax.annotation/javax.annotation-api/1.3.2 - mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1 - mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2.4 + mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spiflyVersion} mvn:org.apache.aries/org.apache.aries.util/1.1.3 mvn:org.eclipse.jetty/jetty-continuation/${jettyVersion} mvn:org.eclipse.jetty/jetty-http/${jettyVersion} mvn:org.eclipse.jetty/jetty-io/${jettyVersion} - mvn:org.eclipse.jetty/jetty-jaspi/${jettyVersion} mvn:org.eclipse.jetty/jetty-plus/${jettyVersion} mvn:org.eclipse.jetty/jetty-jndi/${jettyVersion} mvn:org.eclipse.jetty/jetty-rewrite/${jettyVersion} @@ -267,7 +267,6 @@ mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${jettyVersion} mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${jettyVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-websocket-api/1.1_1 - mvn:org.apache.geronimo.components/geronimo-jaspi/2.0.0 osgi.contract;osgi.contract=JavaServlet;version:Version="${servletApiVersion}";uses:="javax.servlet,javax.servlet.http,javax.servlet.descriptor,javax.servlet.annotation", osgi.contract;osgi.contract=JavaWebSockets;version:Version="1";uses:="javax.websocket, javax.websocket.server" diff --git a/container/karaf/src/main/filtered-resources/etc/blacklisted.properties b/container/karaf/src/main/filtered-resources/etc/blacklisted.properties index e5a252c691db..56911ef051af 100644 --- a/container/karaf/src/main/filtered-resources/etc/blacklisted.properties +++ b/container/karaf/src/main/filtered-resources/etc/blacklisted.properties @@ -16,3 +16,8 @@ pax-war # asm-all doesn't exist anymore, use asm/asm-commons/etc. org.ow2.asm:asm-all + +# pax-web 7.4 doesn't have the jaspi stuff, make sure 7.3 doesn't sneak it in +mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec +mvn:org.eclipse.jetty/jetty-jaspi +mvn:org.apache.geronimo.components/geronimo-jaspi diff --git a/container/karaf/src/main/filtered-resources/etc/overrides.properties b/container/karaf/src/main/filtered-resources/etc/overrides.properties index a98e731a7c44..b25986e1444a 100644 --- a/container/karaf/src/main/filtered-resources/etc/overrides.properties +++ b/container/karaf/src/main/filtered-resources/etc/overrides.properties @@ -17,6 +17,35 @@ mvn:org.apache.sshd/sshd-scp/${minaSshdVersion} mvn:org.apache.sshd/sshd-sftp/${minaSshdVersion} mvn:org.codehaus.jettison/jettison/${jettisonVersion} +# Just In Case (tm) make sure Jetty always gets only our vetted version +mvn:org.eclipse.jetty/jetty-client/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-continuation/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-deploy/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-http/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-io/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-jaas/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-jaspi/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-jmx/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-jndi/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-plus/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-rewrite/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-security/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-server/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-servlet/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-servlets/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-util-ajax/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-util/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-webapp/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty/jetty-xml/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/websocket-api/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/websocket-client/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/websocket-common/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/websocket-server/${jettyVersion};range=[9.4,10) +mvn:org.eclipse.jetty.websocket/websocket-servlet/${jettyVersion};range=[9.4,10) +mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spiflyVersion};range=[1,2) + mvn:org.ow2.asm/asm/${asmVersion};range=[5,10) mvn:org.ow2.asm/asm-analysis/${asmVersion};range=[5,10) mvn:org.ow2.asm/asm-commons/${asmVersion};range=[5,10) diff --git a/container/shared/src/main/filtered-resources/etc/blacklisted.properties b/container/shared/src/main/filtered-resources/etc/blacklisted.properties index b651fd98a5c4..1485beeeb964 100644 --- a/container/shared/src/main/filtered-resources/etc/blacklisted.properties +++ b/container/shared/src/main/filtered-resources/etc/blacklisted.properties @@ -10,3 +10,8 @@ ssh/${karafVersion} # asm-all doesn't exist anymore, use asm/asm-commons/etc. org.ow2.asm:asm-all + +# pax-web 7.4 doesn't have the jaspi stuff, make sure 7.3 doesn't sneak it in +mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec +mvn:org.eclipse.jetty/jetty-jaspi +mvn:org.apache.geronimo.components/geronimo-jaspi diff --git a/container/shared/src/main/filtered-resources/etc/overrides.properties b/container/shared/src/main/filtered-resources/etc/overrides.properties index 454bc53c5e1b..243daca90f5a 100644 --- a/container/shared/src/main/filtered-resources/etc/overrides.properties +++ b/container/shared/src/main/filtered-resources/etc/overrides.properties @@ -24,7 +24,6 @@ mvn:org.eclipse.jetty/jetty-deploy/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-http/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-io/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-jaas/${jettyVersion};range=[9.4,10) -mvn:org.eclipse.jetty/jetty-jaspi/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-jmx/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-jndi/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty/jetty-plus/${jettyVersion};range=[9.4,10) @@ -44,6 +43,7 @@ mvn:org.eclipse.jetty.websocket/websocket-client/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-common/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-server/${jettyVersion};range=[9.4,10) mvn:org.eclipse.jetty.websocket/websocket-servlet/${jettyVersion};range=[9.4,10) +mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spiflyVersion};range=[1,2) mvn:org.ow2.asm/asm/${asmVersion};range=[5,10) mvn:org.ow2.asm/asm-analysis/${asmVersion};range=[5,10) diff --git a/pom.xml b/pom.xml index 56d240fda668..95cdab86d444 100644 --- a/pom.xml +++ b/pom.xml @@ -1675,6 +1675,7 @@ 1.9.14-atlassian-6 2.14.2 1.33 + 1.3.6 0.8.9 6.3.0 1.0-beta-4-OPENNMS-20160912-1 From 68a6958971293dec3c5bb5880d8b4ae9f809e9a7 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 31 Jul 2023 13:59:31 -0400 Subject: [PATCH 020/186] NMS-15345: add symbolic names and versions for all wrapped bundles --- .../src/main/resources/features-core.xml | 16 +- .../main/resources/features-experimental.xml | 8 +- .../src/main/resources/features-minion.xml | 4 +- .../src/main/resources/features-sentinel.xml | 2 +- .../features/src/main/resources/features.xml | 140 +++++++++--------- .../src/main/resources/spring-legacy.xml | 6 +- 6 files changed, 88 insertions(+), 88 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 1622fd38bf4c..e56909d69c6f 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -71,7 +71,7 @@ commons-lang javax.mail javax.servlet - wrap:mvn:org.apache.ant/ant/${antVersion} + wrap:mvn:org.apache.ant/ant/${antVersion}$Bundle-SymbolicName=org.apache.ant.ant&Bundle-Version=${antVersion} mvn:commons-configuration/commons-configuration/${commonsConfigurationVersion} @@ -100,7 +100,7 @@ commons-beanutils javax.servlet mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4 - wrap:mvn:javax.servlet.jsp/jsp-api/2.2 + wrap:mvn:javax.servlet.jsp/jsp-api/2.2$Bundle-SymbolicName=javax.servlet.jsp.jsp-api&Bundle-Version=2.2 mvn:commons-jxpath/commons-jxpath/${commonsJxpathVersion} @@ -135,11 +135,11 @@ wrap - wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14 - wrap:mvn:com.google.errorprone/error_prone_annotations/2.10.0 - wrap:mvn:com.google.guava/failureaccess/1.0.1 - wrap:mvn:org.checkerframework/checker-qual/2.0.0 - wrap:mvn:com.google.j2objc/j2objc-annotations/1.1 + wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14$Bundle-SymbolicName=org.codehaus.mojo.animal-sniffer-annotations&Bundle-Version=1.14 + wrap:mvn:com.google.errorprone/error_prone_annotations/2.10.0$Bundle-SymbolicName=com.google.errorprone.error-prone-annotations&Bundle-Version=2.10.0 + wrap:mvn:com.google.guava/failureaccess/1.0.1$Bundle-SymbolicName=com.google.guava.failureaccess&Bundle-Version=1.0.1 + wrap:mvn:org.checkerframework/checker-qual/2.0.0$Bundle-SymbolicName=org.checkerframework.checker-qual&Bundle-Version=2.0.0 + wrap:mvn:com.google.j2objc/j2objc-annotations/1.1$Bundle-SymbolicName=com.google.j2objc.j2objc-annotations&Bundle-Version=1.1 @@ -288,7 +288,7 @@ - wrap:mvn:org.json/json/${jsonVersion}$Export-Package=org.json + wrap:mvn:org.json/json/${jsonVersion}$Export-Package=org.json&Bundle-Version=${jsonVersion} diff --git a/container/features/src/main/resources/features-experimental.xml b/container/features/src/main/resources/features-experimental.xml index 7f77960d2e00..ad0535f2623f 100644 --- a/container/features/src/main/resources/features-experimental.xml +++ b/container/features/src/main/resources/features-experimental.xml @@ -123,10 +123,10 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalanServicemixVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalanServicemixVersion} - wrap:mvn:org.w3c.css/sac/1.3 + wrap:mvn:org.w3c.css/sac/1.3$Bundle-SymbolicName=org.w3c.css.sac&Bundle-Version=1.3 mvn:com.vaadin.external.flute/flute/1.3.0.gg2 - wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.11 - + wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.11$Bundle-SymbolicName=net.sourceforge.cssparser&Bundle-Version=0.9.11 + commons-cli commons-exec @@ -137,7 +137,7 @@ mvn:org.opennms.features/org.opennms.features.request-tracker/${project.version} - wrap:mvn:org.opennms/rancid-api/${rancidApiVersion} + wrap:mvn:org.opennms/rancid-api/${rancidApiVersion}$Bundle-SymbolicName=org.opennms.rancid-api&Bundle-Version=${rancidApiVersion} mvn:org.opennms/opennms-web-api/${project.version} mvn:org.opennms.core/org.opennms.core.web-assets/${project.version} diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index ed266635f8b8..97abcb53bad9 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -139,8 +139,8 @@ opennms-util mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:com.google.code.gson/gson/${gsonVersion} - wrap:mvn:io.pkts/pkts-core/${pktsVersion} - wrap:mvn:io.pkts/pkts-buffers/${pktsVersion} + wrap:mvn:io.pkts/pkts-core/${pktsVersion}$Bundle-SymbolicName=io.pkts.core&Bundle-Version=${pktsVersion} + wrap:mvn:io.pkts/pkts-buffers/${pktsVersion}$Bundle-SymbolicName=io.pkts.buffers&Bundle-Version=${pktsVersion} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} mvn:org.opennms.features.telemetry.config/org.opennms.features.telemetry.config.api/${project.version} mvn:org.opennms.features.telemetry.config/org.opennms.features.telemetry.config.jaxb/${project.version} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 9e4bab4e04f6..0fd9cc97a8b4 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -150,7 +150,7 @@ mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.impl/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.elastic/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.processing/${project.version} - wrap:mvn:org.freemarker/freemarker/${freemarkerVersion} + wrap:mvn:org.freemarker/freemarker/${freemarkerVersion}$Bundle-SymbolicName=org.freemarker&Bundle-Version=${freemarkerVersion} mvn:org.opennms.core/org.opennms.core.cache/${project.version} mvn:org.opennms.features.telemetry.protocols.netflow/org.opennms.features.telemetry.protocols.netflow.transport/${project.version} mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.common/${project.version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index e9da5422e916..900c92782a74 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -42,33 +42,33 @@ mvn:org.opennms.features.amqp/org.opennms.features.amqp.alarm-northbounder/${project.version} - wrap:mvn:com.atomikos/atomikos-util/${atomikosVersion} - wrap:mvn:com.atomikos/transactions-api/${atomikosVersion} - wrap:mvn:com.atomikos/transactions/${atomikosVersion} - wrap:mvn:com.atomikos/transactions-jta/${atomikosVersion} - wrap:mvn:com.atomikos/transactions-jdbc/${atomikosVersion} + wrap:mvn:com.atomikos/atomikos-util/${atomikosVersion}$Bundle-SymbolicName=com.atomikos.util&Bundle-Version=${atomikosVersion} + wrap:mvn:com.atomikos/transactions-api/${atomikosVersion}$Bundle-SymbolicName=com.atomikos.transactions.api&Bundle-Version=${atomikosVersion} + wrap:mvn:com.atomikos/transactions/${atomikosVersion}$Bundle-SymbolicName=com.atomikos.transactions&Bundle-Version=${atomikosVersion} + wrap:mvn:com.atomikos/transactions-jta/${atomikosVersion}$Bundle-SymbolicName=com.atomikos.transactions.jta&Bundle-Version=${atomikosVersion} + wrap:mvn:com.atomikos/transactions-jdbc/${atomikosVersion}$Bundle-SymbolicName=com.atomikos.transactions.jdbc&Bundle-Version=${atomikosVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalanServicemixVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalanServicemixVersion} - wrap:mvn:xml-apis/xml-apis-ext/1.3.04 - wrap:mvn:org.apache.xmlgraphics/batik-anim/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-awt-util/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-bridge/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-css/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-dom/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-ext/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-gvt/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-parser/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-script/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-svggen/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-svg-dom/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-transcoder/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-util/${batikVersion} - wrap:mvn:org.apache.xmlgraphics/batik-xml/${batikVersion} + wrap:mvn:xml-apis/xml-apis-ext/1.3.04$Bundle-SymbolicName=org.w3c.xml-apis.ext&Bundle-Version=1.3.04 + wrap:mvn:org.apache.xmlgraphics/batik-anim/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.anim&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-awt-util/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.awk.util&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-bridge/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.bridge&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-css/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.css&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-dom/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.dom&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-ext/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.ext&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-gvt/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.gvt&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-parser/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.parser&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-script/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.script&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-svggen/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.svggen&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-svg-dom/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.svg.dom&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-transcoder/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.transcoder&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-util/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.util&Bundle-Version=${batikVersion} + wrap:mvn:org.apache.xmlgraphics/batik-xml/${batikVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.batik.xml&Bundle-Version=${batikVersion} - wrap:mvn:bsf/bsf/${bsfVersion} + wrap:mvn:bsf/bsf/${bsfVersion}$Bundle-SymbolicName=org.apache.bsf&Bundle-Version=${bsfVersion} postgresql @@ -79,14 +79,14 @@ mvn:com.zaxxer/HikariCP/${hikaricpVersion} - wrap:mvn:net.redhogs.cronparser/cron-parser-core/${cronParserCoreVersion} + wrap:mvn:net.redhogs.cronparser/cron-parser-core/${cronParserCoreVersion}$Bundle-SymbolicName=net.redhogs.cronparser.core&Bundle-Version=${cronParserCoreVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjavaVersion} - wrap:mvn:org.apache.xmlgraphics/fop/${fopVersion} - wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/${xmlgraphicsCommonsVersion} + wrap:mvn:org.apache.xmlgraphics/fop/${fopVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.fop&Bundle-Version=${fopVersion} + wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/${xmlgraphicsCommonsVersion}$Bundle-SymbolicName=org.apache.xmlgraphics.commons&Bundle-Version=${xmlgraphicsCommonsVersion} batik @@ -125,22 +125,22 @@ mvn:org.codehaus.groovy/groovy-xml/${groovyVersion} - wrap:mvn:org.dom4j/dom4j/${dom4jVersion} + wrap:mvn:org.dom4j/dom4j/${dom4jVersion}$Bundle-SymbolicName=org.dom4j&Bundle-Version=${dom4jVersion} commons-collections dom4j - wrap:mvn:antlr/antlr/${antlr.version}$Import-Package=org.hibernate.hql.ast + wrap:mvn:antlr/antlr/${antlr.version}$Bundle-SymbolicName=antlr&Bundle-Version=${antlr.version}&Import-Package=org.hibernate.hql.ast mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} mvn:org.javassist/javassist/${javassistVersion} - wrap:mvn:org.hibernate.javax.persistence/hibernate-jpa-2.0-api/1.0.1.Final - wrap:mvn:org.hibernate/hibernate-core/3.6.10.Final$Export-Package=org.hibernate*;version="3.6.10" - wrap:mvn:org.hibernate/hibernate-commons-annotations/3.2.0.Final + wrap:mvn:org.hibernate.javax.persistence/hibernate-jpa-2.0-api/1.0.1.Final$Bundle-SymbolicName=org.hibernate.jpa20.api&Bundle-Version=1.0.1 + wrap:mvn:org.hibernate/hibernate-core/3.6.10.Final$Bundle-SymbolicName=org.hibernate.core&Bundle-Version=3.6.10&Export-Package=org.hibernate*;version="3.6.10" + wrap:mvn:org.hibernate/hibernate-commons-annotations/3.2.0.Final$Bundle-SymbolicName=org.hibernate.commons.annotations&Bundle-Version=3.2.0 javax.validation - wrap:mvn:org.hibernate/hibernate-validator-annotation-processor/4.1.0.Final - wrap:mvn:org.hibernate/hibernate-validator/4.1.0.Final + wrap:mvn:org.hibernate/hibernate-validator-annotation-processor/4.1.0.Final$Bundle-SymbolicName=org.hibernate.validator.annotation-processor&Bundle-Version=4.1.0 + wrap:mvn:org.hibernate/hibernate-validator/4.1.0.Final$Bundle-SymbolicName=org.hibernate.validator&Bundle-Version=4.1.0 javax.mail @@ -153,12 +153,12 @@ bouncycastle mvn:eu.agno3.jcifs/jcifs-ng/${jcifsVersion} - - wrap:mvn:jfree/jfreechart/1.0.13 - wrap:mvn:jfree/jcommon/1.0.16 + + wrap:mvn:org.jfree/jfreechart/1.0.19$Bundle-SymbolicName=org.jfree.jfreechart&Bundle-Version=1.0.19 + wrap:mvn:org.jfree/jcommon/1.0.24$Bundle-SymbolicName=org.jfree.jcommon&Bundle-Version=1.0.24 - wrap:mvn:com.novell.ldap/jldap/${jldapVersion} + wrap:mvn:com.novell.ldap/jldap/${jldapVersion}$Bundle-SymbolicName=com.novell.ldap&Bundle-Version=${jldapVersion} mvn:joda-time/joda-time/${jodaTimeVersion} @@ -174,40 +174,40 @@ mvn:org.jrobin/jrobin/1.6.0 - wrap:mvn:net.sf.ezmorph/ezmorph/1.0.6 - wrap:mvn:net.sf.json-lib/json-lib/2.2.3/jar/jdk15 + wrap:mvn:net.sf.ezmorph/ezmorph/1.0.6$Bundle-SymbolicName=net.sf.ezmorph&Bundle-Version=1.0.6 + wrap:mvn:net.sf.json-lib/json-lib/2.2.3/jar/jdk15$Bundle-SymbolicName=net.sf.json-lib&Bundle-Version=2.2.3 mvn:com.lmax/disruptor/${lmaxDisruptorVersion} - wrap:mvn:org.json/json/${jsonVersion}$Export-Package=org.json + wrap:mvn:org.json/json/${jsonVersion}$Bundle-SymbolicName=org.json&Bundle-Version=${jsonVersion}&Export-Package=org.json - wrap:mvn:com.googlecode.json-simple/json-simple/1.1.1 + wrap:mvn:com.googlecode.json-simple/json-simple/1.1.1$Bundle-SymbolicName=com.googlecode.json-simple&Bundle-Version=1.1.1 - wrap:mvn:org.owasp.encoder/encoder/${owaspEncoderVersion}$Export-Package=org.owasp.encoder + wrap:mvn:org.owasp.encoder/encoder/${owaspEncoderVersion}$Bundle-SymbolicName=org.owasp.encoder&Bundle-Version=${owaspEncoderVersion}&Export-Package=org.owasp.encoder guava - wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$Export-Package=org.owasp.html + wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$Bundle-SymbolicName=com.googlecode.owasp-java.html-sanitizer&Bundle-Version=${owaspHtmlSanitizerVersion}&Export-Package=org.owasp.html pax-jdbc-spec mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion} - wrap:mvn:org.postgresql/postgresql/${postgresqlVersion} + mvn:org.postgresql/postgresql/${postgresqlVersion} joda-time - wrap:mvn:com.swrve/rate-limited-logger/${rateLimitedLoggerVersion} + wrap:mvn:com.swrve/rate-limited-logger/${rateLimitedLoggerVersion}$Bundle-SymbolicName=com.swrve.rate-limited-logger&Bundle-Version=${rateLimitedLoggerVersion} spring-web commons-codec javax.servlet - wrap:mvn:org.springframework.ldap/spring-ldap-core/${springLdapVersion}$Export-Package=org.springframework.ldap*;version="${springLdapVersion}" - wrap:mvn:org.springframework.security/spring-security-aspects/${springSecurityVersion} + wrap:mvn:org.springframework.ldap/spring-ldap-core/${springLdapVersion}$Bundle-SymbolicName=org.springframework.ldap.core&Bundle-Version=${springLdapVersion}&Export-Package=org.springframework.ldap*;version="${springLdapVersion}" + wrap:mvn:org.springframework.security/spring-security-aspects/${springSecurityVersion}$Bundle-SymbolicName=org.springframework.security.aspects&Bundle-Version=${springSecurityVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${springSecurityVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${springSecurityVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-ldap/${springSecurityVersion} @@ -225,15 +225,15 @@ c3p0 mvn:com.zaxxer/HikariCP/2.7.9 - wrap:mvn:org.quartz-scheduler/quartz/${quartzVersion} + mvn:org.quartz-scheduler/quartz/${quartzVersion} - wrap:mvn:org.twitter4j/twitter4j-core/${twitter4jVersion} + wrap:mvn:org.twitter4j/twitter4j-core/${twitter4jVersion}$Bundle-SymbolicName=org.twitter4j.core&Bundle-Version=${twitter4jVersion} - wrap:mvn:io.opentracing/opentracing-api/${opentracingVersion} - wrap:mvn:io.opentracing/opentracing-noop/${opentracingVersion} - wrap:mvn:io.opentracing/opentracing-util/${opentracingVersion} + wrap:mvn:io.opentracing/opentracing-api/${opentracingVersion}$Bundle-SymbolicName=io.opentracing.api&Bundle-Version=${opentracingVersion} + wrap:mvn:io.opentracing/opentracing-noop/${opentracingVersion}$Bundle-SymbolicName=io.opentracing.noop&Bundle-Version=${opentracingVersion} + wrap:mvn:io.opentracing/opentracing-util/${opentracingVersion}$Bundle-SymbolicName=io.opentracing.util&Bundle-Version=${opentracingVersion} opentracing-api @@ -262,7 +262,7 @@ - wrap:mvn:org.opennms/opennms-bootstrap/${project.version} + mvn:org.opennms/opennms-bootstrap/${project.version} @@ -408,8 +408,8 @@ opennms-snmp scv-api mvn:org.opennms.core.mate/org.opennms.core.mate.api/${project.version} - wrap:mvn:com.googlecode.concurrent-locks/concurrent-locks/1.0.0 - wrap:mvn:org.jasypt/jasypt/${jasyptVersion} + wrap:mvn:com.googlecode.concurrent-locks/concurrent-locks/1.0.0$Bundle-SymbolicName=com.googlecode.concurrent-locks&Bundle-Version=1.0.0 + wrap:mvn:org.jasypt/jasypt/${jasyptVersion}$Bundle-SymbolicName=org.jasypt&Bundle-Version=${jasyptVersion} mvn:org.opennms/opennms-config/${project.version} @@ -417,8 +417,8 @@ zookeeper-dependencies mvn:org.scala-lang/scala-library/${scalaLibraryVersion} mvn:com.typesafe.scala-logging/scala-logging_${scalaVersion}/${scalaLoggingVersion} - wrap:mvn:com.yammer.metrics/metrics-core/2.2.0$Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version="2.2.0" - wrap:mvn:com.yammer.metrics/metrics-annotation/2.2.0$Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version="2.2.0" + wrap:mvn:com.yammer.metrics/metrics-core/2.2.0$Bundle-SymbolicName=com.yammer.metrics.core&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version="2.2.0" + wrap:mvn:com.yammer.metrics/metrics-annotation/2.2.0$Bundle-SymbolicName=com.yammer.metrics.annotation&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version="2.2.0" mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_${scalaVersion}/${kafkaBundleVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafkaBundleVersion} mvn:com.github.luben/zstd-jni/${zstdJniVersion} @@ -444,8 +444,8 @@ rate-limited-logger fst mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.offheap/${project.version} - wrap:mvn:com.squareup.tape2/tape/${tape2Version} - wrap:mvn:org.rocksdb/rocksdbjni/${rocksdbjniVersion} + wrap:mvn:com.squareup.tape2/tape/${tape2Version}$Bundle-SymbolicName=com.squareup.tape2&Bundle-Version=2.0 + wrap:mvn:org.rocksdb/rocksdbjni/${rocksdbjniVersion}$Bundle-SymbolicName=org.rocksdb.jni&Bundle-Version=${rocksdbjniVersion} opennms-core-ipc-sink-api @@ -491,7 +491,7 @@ opennms-distributed-core-api opennms-health-api opennms-rpc-utils - wrap:mvn:ch.hsr/geohash/${geohashVersion} + wrap:mvn:ch.hsr/geohash/${geohashVersion}$Bundle-SymbolicName=ch.hsr.geohash&Bundle-Version=${geohashVersion} mvn:org.opennms.core.ipc.rpc/org.opennms.core.ipc.rpc.api/${project.version} mvn:org.opennms.core.ipc.rpc/org.opennms.core.ipc.rpc.xml/${project.version} mvn:org.opennms.core.ipc.rpc/org.opennms.core.ipc.rpc.common/${project.version} @@ -761,11 +761,11 @@ mvn:org.opennms.features/org.opennms.features.eif-adapter/${project.version} - wrap:mvn:org.igniterealtime.smack/smack-core/${smackVersion} - wrap:mvn:org.igniterealtime.smack/smack-tcp/${smackVersion} - wrap:mvn:org.igniterealtime.smack/smack-extensions/${smackVersion} - wrap:mvn:org.igniterealtime.smack/smack-resolver-javax/${smackVersion} - wrap:mvn:xmlpull/xmlpull/1.1.3.1 + mvn:org.igniterealtime.smack/smack-core/${smackVersion}$Bundle-Sym + mvn:org.igniterealtime.smack/smack-tcp/${smackVersion} + mvn:org.igniterealtime.smack/smack-extensions/${smackVersion} + mvn:org.igniterealtime.smack/smack-resolver-javax/${smackVersion} + wrap:mvn:xmlpull/xmlpull/1.1.3.1$Bundle-SymbolicName=xmlpull&Bundle-Version=1.1.3.1 guava17 @@ -793,8 +793,8 @@ opennms-collection-api opennms-provisioning-api jcifs - wrap:mvn:com.github.skyghis/j-interop-ng/${jinteropVersion} - wrap:mvn:com.github.skyghis/j-interop-ng-deps/${jinteropVersion} + wrap:mvn:com.github.skyghis/j-interop-ng/${jinteropVersion}$Bundle-SymbolicName=com.github.skyghis.j-interop-ng&Bundle-Version=${jinteropVersion} + wrap:mvn:com.github.skyghis/j-interop-ng-deps/${jinteropVersion}$Bundle-SymbolicName=com.github.skyghis.j-interop-ng.deps&Bundle-Version=${jinteropVersion} mvn:org.opennms/opennms-wmi/${project.version} @@ -810,11 +810,11 @@ jackson1 joda-time opennms-core-web - wrap:mvn:com.github.mwiede/jsch/${jschVersion} + mvn:com.github.mwiede/jsch/${jschVersion} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/1.0.6_1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/2.4_1 - wrap:mvn:org.jsoup/jsoup/${jsoupVersion} + mvn:org.jsoup/jsoup/${jsoupVersion} mvn:org.opennms.protocols/org.opennms.protocols.xml/${project.version} mvn:org.opennms.features.distributed/org.opennms.features.distributed.kv-store.api/${project.version} @@ -865,9 +865,9 @@ guava mvn:org.apache.httpcomponents/httpcore-osgi/${httpcoreVersion} mvn:org.apache.httpcomponents/httpclient-osgi/${httpclientVersion} - wrap:mvn:com.toastcoders/yavijava/6.0.03 - wrap:mvn:org.sblim.slp/sblimSLPClient/1.17 - wrap:mvn:org.sblim.wbem/sblimCIMClient/1.17 + wrap:mvn:com.toastcoders/yavijava/6.0.05$Bundle-SymbolicName=com.toastcoders.yavijava&Bundle-Version=6.0.05 + wrap:mvn:org.sblim.slp/sblimSLPClient/1.17$Bundle-SymbolicName=org.sblim.slp.client&Bundle-Version=1.17 + wrap:mvn:org.sblim.wbem/sblimCIMClient/1.17$Bundle-SymbolicName=org.sblim.webm.client&Bundle-Version=1.17 mvn:org.opennms/opennms-vmware/${project.version} diff --git a/container/features/src/main/resources/spring-legacy.xml b/container/features/src/main/resources/spring-legacy.xml index dd2d4245dee8..d14e7af43786 100644 --- a/container/features/src/main/resources/spring-legacy.xml +++ b/container/features/src/main/resources/spring-legacy.xml @@ -110,7 +110,7 @@ pax-url-wrap spring-web - wrap:mvn:javax.portlet/portlet-api/2.0$Export-Package=javax.portlet.*;version=2.0 + wrap:mvn:javax.portlet/portlet-api/2.0$Bundle-SymbolicName=javax.portlet.api&Bundle-Version=2.0&Export-Package=javax.portlet.*;version=2.0 mvn:org.springframework/spring-webmvc-portlet/3.1.4.RELEASE @@ -221,7 +221,7 @@ wrap spring-web - wrap:mvn:javax.portlet/portlet-api/2.0$Export-Package=javax.portlet.*;version=2.0 + wrap:mvn:javax.portlet/portlet-api/2.0$Bundle-SymbolicName=javax.portlet.api&Bundle-Version=2.0&Export-Package=javax.portlet.*;version=2.0 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${springVersion} @@ -345,7 +345,7 @@ pax-url-wrap spring-web - wrap:mvn:javax.portlet/portlet-api/2.0$Export-Package=javax.portlet.*;version=2.0 + wrap:mvn:javax.portlet/portlet-api/2.0$Bundle-SymbolicName=javax.portlet.api&Bundle-Version=2.0&Export-Package=javax.portlet.*;version=2.0 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/4.3.30.RELEASE_1 From 9aec9f5b89e275bf6d193accecd9271a78207cf0 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 1 Aug 2023 12:46:27 -0400 Subject: [PATCH 021/186] NMS-15345: fix double-build in sentinel runInPlace --- features/sentinel/runInPlace.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/features/sentinel/runInPlace.sh b/features/sentinel/runInPlace.sh index 455ef14c905f..296c8ba642df 100755 --- a/features/sentinel/runInPlace.sh +++ b/features/sentinel/runInPlace.sh @@ -41,9 +41,7 @@ cleanup_and_build() { $cmd_prefix rm -rf "${CONTAINERDIR}"/target/sentinel-karaf-* # Rebuild - we've already verified that we're in the right folder - (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${REBUILD_PREREQUISITES}" install) && \ - compile.pl clean install && \ - (cd "${CONTAINERDIR}"; compile.pl clean install) + (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${BUILD_PREREQUISITES}" install) } set_instance_specific_configuration() { From 43199eb0ef0aa6d653f263674e4b7234c41dbdb7 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 1 Aug 2023 12:46:27 -0400 Subject: [PATCH 022/186] NMS-15345: fix double-build in sentinel runInPlace --- features/newts/pom.xml | 11 ----------- features/sentinel/runInPlace.sh | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/features/newts/pom.xml b/features/newts/pom.xml index e94ef3ef28c2..d844538cd016 100644 --- a/features/newts/pom.xml +++ b/features/newts/pom.xml @@ -21,10 +21,6 @@ JavaSE-1.8 ${project.groupId}.${project.artifactId} ${project.version} - - com.google.common.*;version="[18.0,26)", - * - @@ -60,13 +56,6 @@ newts-dependencies pom - - - com.google.guava - guava - 18.0 - provided - com.googlecode.concurrent-trees concurrent-trees diff --git a/features/sentinel/runInPlace.sh b/features/sentinel/runInPlace.sh index 0f7d97b07e46..0b623c06c64c 100755 --- a/features/sentinel/runInPlace.sh +++ b/features/sentinel/runInPlace.sh @@ -41,9 +41,7 @@ cleanup_and_build() { $cmd_prefix rm -rf "${CONTAINERDIR}"/target/sentinel-karaf-* # Rebuild - we've already verified that we're in the right folder - (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${REBUILD_PREREQUISITES}" install) && \ - compile.pl clean install && \ - (cd "${CONTAINERDIR}"; compile.pl clean install) + (cd ../..; compile.pl -DskipNodeJSBuild=true -DskipTests --projects "${BUILD_PREREQUISITES}" install) } set_instance_specific_configuration() { From e35c2545fdce7a53b18b0b3c26b4c1a1b58c89f8 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 1 Aug 2023 16:31:17 -0400 Subject: [PATCH 023/186] NMS-15345: add some missing prerequisite features to runInPlace --- features/sentinel/runInPlace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/sentinel/runInPlace.sh b/features/sentinel/runInPlace.sh index 296c8ba642df..03e44c4c2e6a 100755 --- a/features/sentinel/runInPlace.sh +++ b/features/sentinel/runInPlace.sh @@ -12,7 +12,7 @@ JAVA_OPTS="-Xmx2g" export PATH CONTAINERDIR JAVA_OPTS -BUILD_PREREQUISITES="org.opennms.karaf:opennms,:org.opennms.container.shared,org.opennms.features.sentinel:repository" +BUILD_PREREQUISITES="org.opennms.karaf:opennms,:org.opennms.container.shared,org.opennms.features.container:sentinel,org.opennms.features.sentinel:repository" cleanup_and_build() { should_use_sudo=$1 From 3011b96e32466f95743310b0a2b666c0d03166a1 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 1 Aug 2023 17:02:45 -0400 Subject: [PATCH 024/186] NMS-15345: fix cassandra 4 dependency chain --- .../src/main/resources/features-core.xml | 27 +++++++++++++------ dependencies/newts/pom.xml | 5 ++++ pom.xml | 5 ---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index 64bb177010d1..cee4799fa653 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -33,16 +33,16 @@ + dropwizard-metrics netty jackson-core - mvn:io.dropwizard.metrics/metrics-core/4.2.10 - mvn:com.datastax.oss/java-driver-core/${cassandraVersion} - mvn:com.datastax.oss/native-protocol/1.5.1 - mvn:com.datastax.oss/java-driver-shaded-guava/25.1-jre-graal-sub-1 - mvn:com.datastax.oss/java-driver-query-builder/${cassandraVersion} - mvn:com.typesafe/config/1.4.1 - mvn:org.hdrhistogram/HdrHistogram/2.1.12 - mvn:com.github.jnr/jnr-posix/${jnrVersion} + jnr + mvn:com.datastax.oss/java-driver-core/${cassandraVersion} + mvn:com.datastax.oss/native-protocol/1.5.1 + mvn:com.datastax.oss/java-driver-shaded-guava/25.1-jre-graal-sub-1 + mvn:com.datastax.oss/java-driver-query-builder/${cassandraVersion} + mvn:com.typesafe/config/1.4.2 + mvn:org.hdrhistogram/HdrHistogram/2.1.12 @@ -225,6 +225,17 @@ mvn:net.java.dev.jna/jna-platform/${jnaVersion} + + asm + wrap:mvn:com.github.jnr/jffi/1.3.11$Bundle-SymbolicName=jnr-jffi&Bundle-Version=1.3.11 + wrap:mvn:com.github.jnr/jffi/1.3.11/jar/native$Bundle-SymbolicName=jnr-jffi-native&Bundle-Version=1.3.11 + wrap:mvn:com.github.jnr/jnr-a64asm/1.0.0$Bundle-SymbolicName=jnr-a64asm&Bundle-Version=1.0.0 + mvn:com.github.jnr/jnr-constants/0.10.4 + mvn:com.github.jnr/jnr-ffi/2.2.14 + mvn:com.github.jnr/jnr-posix/${jnrVersion} + wrap:mvn:com.github.jnr/jnr-x86asm/1.0.2$Bundle-SymbolicName=jnr-x86asm&Bundle-Version=1.0.2 + + asm diff --git a/dependencies/newts/pom.xml b/dependencies/newts/pom.xml index e7920d6c9609..91792fef7e2c 100644 --- a/dependencies/newts/pom.xml +++ b/dependencies/newts/pom.xml @@ -63,5 +63,10 @@ high-scale-lib 2.0.0 + + com.github.jnr + jnr-posix + ${jnrVersion} + diff --git a/pom.xml b/pom.xml index 2dc53dbe09f7..a4e7ebea516a 100644 --- a/pom.xml +++ b/pom.xml @@ -4640,11 +4640,6 @@ javax.servlet-api ${servletApiVersion} - - com.github.jnr - jnr-posix - ${jnrVersion} - com.github.mwiede jsch From 299bde9f14954662e00a3c59369aa014e6d98546 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 2 Aug 2023 12:42:48 -0400 Subject: [PATCH 025/186] cassandra --- container/features/src/main/resources/features-core.xml | 6 +++--- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index cee4799fa653..19622b4ea6d0 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -227,12 +227,12 @@ asm - wrap:mvn:com.github.jnr/jffi/1.3.11$Bundle-SymbolicName=jnr-jffi&Bundle-Version=1.3.11 - wrap:mvn:com.github.jnr/jffi/1.3.11/jar/native$Bundle-SymbolicName=jnr-jffi-native&Bundle-Version=1.3.11 - wrap:mvn:com.github.jnr/jnr-a64asm/1.0.0$Bundle-SymbolicName=jnr-a64asm&Bundle-Version=1.0.0 mvn:com.github.jnr/jnr-constants/0.10.4 mvn:com.github.jnr/jnr-ffi/2.2.14 mvn:com.github.jnr/jnr-posix/${jnrVersion} + wrap:mvn:com.github.jnr/jffi/1.3.11$Bundle-SymbolicName=com.github.jnr.jffi&Bundle-Version=1.3.11&Export-Package=com.kenai.jffi;version="1.3.11" + wrap:mvn:com.github.jnr/jffi/1.3.11/jar/native$Bundle-SymbolicName=com.github.jnr.jffi.native&Bundle-Version=1.3.11&Export-Package=jni*;version="1.3.11" + wrap:mvn:com.github.jnr/jnr-a64asm/1.0.0$Bundle-SymbolicName=jnr-a64asm&Bundle-Version=1.0.0 wrap:mvn:com.github.jnr/jnr-x86asm/1.0.2$Bundle-SymbolicName=jnr-x86asm&Bundle-Version=1.0.2 diff --git a/pom.xml b/pom.xml index a4e7ebea516a..f709d236a8e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1596,8 +1596,8 @@ 3.5.0 2.8.0 2.19.1 - - 4.15.0 + + 4.17.0 3.2.0 1.9.4 1.2 From 2868cdfbd067fdd49a0fa6bd3ab2a0cf0cdae57c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:40:08 +0000 Subject: [PATCH 026/186] build(deps-dev): bump @babel/plugin-transform-runtime Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.22.9 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-plugin-transform-runtime) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-runtime" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 128 +++++++++++++++--------------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..3eed7392f49b 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -438,9 +438,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz", - "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", + "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", "dev": true, "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -450,7 +450,7 @@ "resolve": "^1.14.2" }, "peerDependencies": { - "@babel/core": "^7.4.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": { @@ -1751,16 +1751,16 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", - "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz", + "integrity": "sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==", "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.4", - "babel-plugin-polyfill-corejs3": "^0.8.2", - "babel-plugin-polyfill-regenerator": "^0.5.1", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", "semver": "^6.3.1" }, "engines": { @@ -3552,15 +3552,6 @@ "dev": true, "optional": true }, - "node_modules/@nicolo-ribaudo/semver-v6": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", - "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5835,42 +5826,51 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz", - "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", + "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.1", - "@nicolo-ribaudo/semver-v6": "^6.3.3" + "@babel/helper-define-polyfill-provider": "^0.4.2", + "semver": "^6.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz", - "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz", + "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.1", + "@babel/helper-define-polyfill-provider": "^0.4.2", "core-js-compat": "^3.31.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz", - "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", + "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.1" + "@babel/helper-define-polyfill-provider": "^0.4.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-transform-es2015-arrow-functions": { @@ -22555,9 +22555,9 @@ } }, "@babel/helper-define-polyfill-provider": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz", - "integrity": "sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", + "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", "dev": true, "requires": { "@babel/helper-compilation-targets": "^7.22.6", @@ -23428,16 +23428,16 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", - "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz", + "integrity": "sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.4", - "babel-plugin-polyfill-corejs3": "^0.8.2", - "babel-plugin-polyfill-regenerator": "^0.5.1", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", "semver": "^6.3.1" }, "dependencies": { @@ -24791,12 +24791,6 @@ "dev": true, "optional": true }, - "@nicolo-ribaudo/semver-v6": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz", - "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==", - "dev": true - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -26563,33 +26557,41 @@ } }, "babel-plugin-polyfill-corejs2": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz", - "integrity": "sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", + "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", "dev": true, "requires": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.1", - "@nicolo-ribaudo/semver-v6": "^6.3.3" + "@babel/helper-define-polyfill-provider": "^0.4.2", + "semver": "^6.3.1" + }, + "dependencies": { + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + } } }, "babel-plugin-polyfill-corejs3": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz", - "integrity": "sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz", + "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.4.1", + "@babel/helper-define-polyfill-provider": "^0.4.2", "core-js-compat": "^3.31.0" } }, "babel-plugin-polyfill-regenerator": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz", - "integrity": "sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", + "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.4.1" + "@babel/helper-define-polyfill-provider": "^0.4.2" } }, "babel-plugin-transform-es2015-arrow-functions": { From d34b76c09437db41c69b0d5e77a55a8ef73416a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:40:50 +0000 Subject: [PATCH 027/186] build(deps): bump @babel/runtime-corejs3 in /core/web-assets Bumps [@babel/runtime-corejs3](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime-corejs3) from 7.22.6 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-runtime-corejs3) --- updated-dependencies: - dependency-name: "@babel/runtime-corejs3" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..a96830d5faec 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -2112,17 +2112,22 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.6.tgz", - "integrity": "sha512-M+37LLIRBTEVjktoJjbw4KVhupF0U/3PYUCbBwgAd9k17hoKhRu1n935QiG7Tuxv0LJOMrb2vuKEeYUlv0iyiw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz", + "integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==", "dependencies": { "core-js-pure": "^3.30.2", - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + }, "node_modules/@babel/template": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", @@ -23702,12 +23707,19 @@ } }, "@babel/runtime-corejs3": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.6.tgz", - "integrity": "sha512-M+37LLIRBTEVjktoJjbw4KVhupF0U/3PYUCbBwgAd9k17hoKhRu1n935QiG7Tuxv0LJOMrb2vuKEeYUlv0iyiw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz", + "integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==", "requires": { "core-js-pure": "^3.30.2", - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + } } }, "@babel/template": { From 67e38a6959741241487b8dba27f59139bbd42167 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:41:22 +0000 Subject: [PATCH 028/186] build(deps-dev): bump @babel/core in /core/web-assets Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.9 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 177 +++++++++++++++--------------- 1 file changed, 88 insertions(+), 89 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..f93b875a6336 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -210,12 +210,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.10", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" @@ -231,21 +232,21 @@ } }, "node_modules/@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", + "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", + "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", + "@babel/helpers": "^7.22.10", + "@babel/parser": "^7.22.10", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -299,12 +300,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", - "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", + "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.22.10", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -352,9 +353,9 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", + "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.9", @@ -365,9 +366,6 @@ }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -688,27 +686,27 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", + "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", "dev": true, "dependencies": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", + "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -716,9 +714,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", + "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -2138,19 +2136,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", + "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/parser": "^7.22.10", + "@babel/types": "^7.22.10", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2175,9 +2173,9 @@ "dev": true }, "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", + "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", @@ -22380,12 +22378,13 @@ } }, "@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", "dev": true, "requires": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.10", + "chalk": "^2.4.2" } }, "@babel/compat-data": { @@ -22395,21 +22394,21 @@ "dev": true }, "@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", + "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", + "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", + "@babel/helpers": "^7.22.10", + "@babel/parser": "^7.22.10", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -22447,12 +22446,12 @@ } }, "@babel/generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", - "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", + "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", "dev": true, "requires": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.22.10", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -22490,9 +22489,9 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", + "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", "dev": true, "requires": { "@babel/compat-data": "^7.22.9", @@ -22739,31 +22738,31 @@ } }, "@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", + "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", "dev": true, "requires": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.22.10", + "@babel/types": "^7.22.10" } }, "@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", + "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", + "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -23722,19 +23721,19 @@ } }, "@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", + "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", + "@babel/code-frame": "^7.22.10", + "@babel/generator": "^7.22.10", "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/parser": "^7.22.10", + "@babel/types": "^7.22.10", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -23757,9 +23756,9 @@ } }, "@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", + "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.22.5", From 66e818544ef0d988dafc5169df85a1d371da1c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:46:12 +0000 Subject: [PATCH 029/186] build(deps): bump com.datastax.cassandra:cassandra-driver-core Bumps [com.datastax.cassandra:cassandra-driver-core](https://github.com/datastax/java-driver) from 3.11.2 to 3.11.4. - [Release notes](https://github.com/datastax/java-driver/releases) - [Commits](https://github.com/datastax/java-driver/compare/3.11.2...3.11.4) --- updated-dependencies: - dependency-name: com.datastax.cassandra:cassandra-driver-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3deb791e394f..a56d52e84c84 100644 --- a/pom.xml +++ b/pom.xml @@ -1584,7 +1584,7 @@ 2.19.1 3.11.2.0 - 3.11.2 + 3.11.4 3.2.0 1.9.4 1.16.0 From 6b0cfc4573e2c9d7698b3c9ba0b15b1ad431aed3 Mon Sep 17 00:00:00 2001 From: synqotik Date: Tue, 8 Aug 2023 16:37:08 -0400 Subject: [PATCH 030/186] NMS-16057: Prevent query in response to client for invalid Node filterRule Rest call --- .../org/opennms/web/rest/v1/NodeRestService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/NodeRestService.java b/opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/NodeRestService.java index 2f763de4e75d..06f9cefa4711 100644 --- a/opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/NodeRestService.java +++ b/opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/NodeRestService.java @@ -60,10 +60,10 @@ import org.opennms.netmgt.dao.api.MonitoringLocationDao; import org.opennms.netmgt.dao.api.NodeDao; import org.opennms.netmgt.dao.api.SessionUtils; -import org.opennms.netmgt.events.api.EventConstants; import org.opennms.netmgt.events.api.EventProxy; import org.opennms.netmgt.events.api.EventProxyException; import org.opennms.netmgt.filter.api.FilterDao; +import org.opennms.netmgt.filter.api.FilterParseException; import org.opennms.netmgt.model.OnmsCategory; import org.opennms.netmgt.model.OnmsCategoryCollection; import org.opennms.netmgt.model.OnmsGeolocation; @@ -135,7 +135,15 @@ public OnmsNodeList getNodes(@Context final UriInfo uriInfo) { } crit = filterForNodeIds(builder, nodeIds).toCriteria(); } else if (params.getFirst("filterRule") != null) { - final Set filteredNodeIds = m_filterDao.getNodeMap(params.getFirst("filterRule")).keySet(); + Set filteredNodeIds = null; + + try { + filteredNodeIds = m_filterDao.getNodeMap(params.getFirst("filterRule")).keySet(); + } catch (FilterParseException fpe) { + // do not rethrow, the exception may contain the actual SQL query which should not be seen by consumers + throw getException(Status.BAD_REQUEST, "Invalid 'filterRule' in request."); + } + if (filteredNodeIds.size() < 1) { // The "in" criteria fails if the list of node ids is empty final OnmsNodeList coll = new OnmsNodeList(Collections.emptyList()); From 61ca863bfcfcbbd7198e1edddd33f64f23551797 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:01:57 +0000 Subject: [PATCH 031/186] build(deps-dev): bump @babel/plugin-transform-destructuring Bumps [@babel/plugin-transform-destructuring](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-destructuring) from 7.22.5 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-plugin-transform-destructuring) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-destructuring" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..65ec5cfa963d 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -1270,9 +1270,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz", - "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", + "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -23127,9 +23127,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz", - "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", + "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5" From 4a97496d8069cdd30819006dcb0affb52ae7c729 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:03:21 +0000 Subject: [PATCH 032/186] build(deps-dev): bump @babel/cli in /core/web-assets Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli) from 7.22.9 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-cli) --- updated-dependencies: - dependency-name: "@babel/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..84db9046c6a4 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -152,9 +152,9 @@ } }, "node_modules/@babel/cli": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.22.9.tgz", - "integrity": "sha512-nb2O7AThqRo7/E53EGiuAkMaRbb7J5Qp3RvN+dmua1U+kydm0oznkhqbTEG15yk26G/C3yL6OdZjzgl+DMXVVA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.22.10.tgz", + "integrity": "sha512-rM9ZMmaII630zGvtMtQ3P4GyHs28CHLYE9apLG7L8TgaSqcfoIGrlLSLsh4Q8kDTdZQQEXZm1M0nQtOvU/2heg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", @@ -22341,9 +22341,9 @@ } }, "@babel/cli": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.22.9.tgz", - "integrity": "sha512-nb2O7AThqRo7/E53EGiuAkMaRbb7J5Qp3RvN+dmua1U+kydm0oznkhqbTEG15yk26G/C3yL6OdZjzgl+DMXVVA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.22.10.tgz", + "integrity": "sha512-rM9ZMmaII630zGvtMtQ3P4GyHs28CHLYE9apLG7L8TgaSqcfoIGrlLSLsh4Q8kDTdZQQEXZm1M0nQtOvU/2heg==", "dev": true, "requires": { "@jridgewell/trace-mapping": "^0.3.17", From 29ab8e9d8ec01c7d7b73f1518ca871a066889098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:03:45 +0000 Subject: [PATCH 033/186] build(deps-dev): bump @babel/plugin-transform-regenerator Bumps [@babel/plugin-transform-regenerator](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-regenerator) from 7.22.5 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-plugin-transform-regenerator) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-regenerator" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 58 +++++++++++++++++++------------ 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 6ff5bb6f4143..f7c66c64074e 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -1718,13 +1718,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz", - "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "regenerator-transform": "^0.15.1" + "regenerator-transform": "^0.15.2" }, "engines": { "node": ">=6.9.0" @@ -2098,12 +2098,12 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", - "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", + "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", "dev": true, "dependencies": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" @@ -2126,6 +2126,12 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "dev": true + }, "node_modules/@babel/template": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", @@ -18528,9 +18534,9 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "dependencies": { "@babel/runtime": "^7.8.4" @@ -23413,13 +23419,13 @@ } }, "@babel/plugin-transform-regenerator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz", - "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5", - "regenerator-transform": "^0.15.1" + "regenerator-transform": "^0.15.2" } }, "@babel/plugin-transform-reserved-words": { @@ -23697,12 +23703,20 @@ "dev": true }, "@babel/runtime": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", - "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", + "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", "dev": true, "requires": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "dev": true + } } }, "@babel/runtime-corejs3": { @@ -36548,9 +36562,9 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "requires": { "@babel/runtime": "^7.8.4" From e20c8b1963d6fb296531a57f6092ddc3dc0ec790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:04:37 +0000 Subject: [PATCH 034/186] build(deps-dev): bump @babel/preset-env in /core/web-assets Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.9 to 7.22.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 262 ++++++++++++++---------------- 1 file changed, 121 insertions(+), 141 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 6ff5bb6f4143..86dbfbc49b08 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -573,15 +573,14 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz", - "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", + "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-wrap-function": "^7.22.9" }, "engines": { "node": ">=6.9.0" @@ -671,15 +670,14 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz", - "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", + "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", "dev": true, "dependencies": { "@babel/helper-function-name": "^7.22.5", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.10" }, "engines": { "node": ">=6.9.0" @@ -822,22 +820,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", - "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", @@ -1131,14 +1113,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz", - "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz", + "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.9", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -1181,9 +1163,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz", - "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz", + "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1268,9 +1250,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz", - "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", + "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1637,9 +1619,9 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz", - "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz", + "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1718,13 +1700,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz", - "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "regenerator-transform": "^0.15.1" + "regenerator-transform": "^0.15.2" }, "engines": { "node": ">=6.9.0" @@ -1872,9 +1854,9 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz", - "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1954,13 +1936,13 @@ "hasInstallScript": true }, "node_modules/@babel/preset-env": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", - "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz", + "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.5", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", @@ -1985,15 +1967,15 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-generator-functions": "^7.22.10", "@babel/plugin-transform-async-to-generator": "^7.22.5", "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.10", "@babel/plugin-transform-class-properties": "^7.22.5", "@babel/plugin-transform-class-static-block": "^7.22.5", "@babel/plugin-transform-classes": "^7.22.6", "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.10", "@babel/plugin-transform-dotall-regex": "^7.22.5", "@babel/plugin-transform-duplicate-keys": "^7.22.5", "@babel/plugin-transform-dynamic-import": "^7.22.5", @@ -2016,27 +1998,27 @@ "@babel/plugin-transform-object-rest-spread": "^7.22.5", "@babel/plugin-transform-object-super": "^7.22.5", "@babel/plugin-transform-optional-catch-binding": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-optional-chaining": "^7.22.10", "@babel/plugin-transform-parameters": "^7.22.5", "@babel/plugin-transform-private-methods": "^7.22.5", "@babel/plugin-transform-private-property-in-object": "^7.22.5", "@babel/plugin-transform-property-literals": "^7.22.5", - "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.10", "@babel/plugin-transform-reserved-words": "^7.22.5", "@babel/plugin-transform-shorthand-properties": "^7.22.5", "@babel/plugin-transform-spread": "^7.22.5", "@babel/plugin-transform-sticky-regex": "^7.22.5", "@babel/plugin-transform-template-literals": "^7.22.5", "@babel/plugin-transform-typeof-symbol": "^7.22.5", - "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.10", "@babel/plugin-transform-unicode-property-regex": "^7.22.5", "@babel/plugin-transform-unicode-regex": "^7.22.5", "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.4", - "babel-plugin-polyfill-corejs3": "^0.8.2", - "babel-plugin-polyfill-regenerator": "^0.5.1", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "@babel/types": "^7.22.10", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -2057,19 +2039,17 @@ } }, "node_modules/@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", "@babel/types": "^7.4.4", "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@babel/preset-typescript": { @@ -2098,12 +2078,12 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", - "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", + "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", "dev": true, "dependencies": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" @@ -2126,6 +2106,12 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "dev": true + }, "node_modules/@babel/template": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", @@ -18528,9 +18514,9 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "dependencies": { "@babel/runtime": "^7.8.4" @@ -22660,15 +22646,14 @@ "dev": true }, "@babel/helper-remap-async-to-generator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz", - "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", + "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-wrap-function": "^7.22.9" } }, "@babel/helper-replace-supers": { @@ -22731,15 +22716,14 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz", - "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", + "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", "dev": true, "requires": { "@babel/helper-function-name": "^7.22.5", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.10" } }, "@babel/helpers": { @@ -22832,16 +22816,6 @@ "dev": true, "requires": {} }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", - "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", @@ -23042,14 +23016,14 @@ } }, "@babel/plugin-transform-async-generator-functions": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz", - "integrity": "sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz", + "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.9", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, @@ -23074,9 +23048,9 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz", - "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz", + "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5" @@ -23131,9 +23105,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz", - "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", + "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5" @@ -23362,9 +23336,9 @@ } }, "@babel/plugin-transform-optional-chaining": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz", - "integrity": "sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz", + "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5", @@ -23413,13 +23387,13 @@ } }, "@babel/plugin-transform-regenerator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz", - "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5", - "regenerator-transform": "^0.15.1" + "regenerator-transform": "^0.15.2" } }, "@babel/plugin-transform-reserved-words": { @@ -23512,9 +23486,9 @@ } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz", - "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.22.5" @@ -23569,13 +23543,13 @@ } }, "@babel/preset-env": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", - "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz", + "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==", "dev": true, "requires": { "@babel/compat-data": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.5", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", @@ -23600,15 +23574,15 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-generator-functions": "^7.22.10", "@babel/plugin-transform-async-to-generator": "^7.22.5", "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.10", "@babel/plugin-transform-class-properties": "^7.22.5", "@babel/plugin-transform-class-static-block": "^7.22.5", "@babel/plugin-transform-classes": "^7.22.6", "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.10", "@babel/plugin-transform-dotall-regex": "^7.22.5", "@babel/plugin-transform-duplicate-keys": "^7.22.5", "@babel/plugin-transform-dynamic-import": "^7.22.5", @@ -23631,27 +23605,27 @@ "@babel/plugin-transform-object-rest-spread": "^7.22.5", "@babel/plugin-transform-object-super": "^7.22.5", "@babel/plugin-transform-optional-catch-binding": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-optional-chaining": "^7.22.10", "@babel/plugin-transform-parameters": "^7.22.5", "@babel/plugin-transform-private-methods": "^7.22.5", "@babel/plugin-transform-private-property-in-object": "^7.22.5", "@babel/plugin-transform-property-literals": "^7.22.5", - "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.10", "@babel/plugin-transform-reserved-words": "^7.22.5", "@babel/plugin-transform-shorthand-properties": "^7.22.5", "@babel/plugin-transform-spread": "^7.22.5", "@babel/plugin-transform-sticky-regex": "^7.22.5", "@babel/plugin-transform-template-literals": "^7.22.5", "@babel/plugin-transform-typeof-symbol": "^7.22.5", - "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.10", "@babel/plugin-transform-unicode-property-regex": "^7.22.5", "@babel/plugin-transform-unicode-regex": "^7.22.5", "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.4", - "babel-plugin-polyfill-corejs3": "^0.8.2", - "babel-plugin-polyfill-regenerator": "^0.5.1", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "@babel/types": "^7.22.10", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -23665,14 +23639,12 @@ } }, "@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", "@babel/types": "^7.4.4", "esutils": "^2.0.2" } @@ -23697,12 +23669,20 @@ "dev": true }, "@babel/runtime": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", - "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", + "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", "dev": true, "requires": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "dev": true + } } }, "@babel/runtime-corejs3": { @@ -36548,9 +36528,9 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "requires": { "@babel/runtime": "^7.8.4" From d61cc6c2b4e8a1a4b32d74d1ba68756ac7d59c58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:04:41 +0000 Subject: [PATCH 035/186] build(deps): bump regenerator-runtime in /core/web-assets Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.11 to 0.14.0. - [Release notes](https://github.com/facebook/regenerator/releases) - [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.11...regenerator-runtime@0.14.0) --- updated-dependencies: - dependency-name: regenerator-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 52 ++++++++++++++++++++++++++----- core/web-assets/package.json | 2 +- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 0f09ab2e2fb2..c2781e078497 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -53,7 +53,7 @@ "leaflet.markercluster": "^1.5.3", "moment": "^2.29.1", "popper.js": "^1.16.1", - "regenerator-runtime": "^0.13.9", + "regenerator-runtime": "^0.14.0", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.0.3", "ui-bootstrap4": "^3.0.7", @@ -1955,6 +1955,12 @@ "dev": true, "hasInstallScript": true }, + "node_modules/@babel/polyfill/node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true + }, "node_modules/@babel/preset-env": { "version": "7.22.9", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", @@ -2123,6 +2129,17 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true + }, "node_modules/@babel/template": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", @@ -18520,9 +18537,9 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, "node_modules/regenerator-transform": { "version": "0.15.1", @@ -23561,6 +23578,12 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", "dev": true + }, + "regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true } } }, @@ -23699,6 +23722,14 @@ "dev": true, "requires": { "regenerator-runtime": "^0.13.11" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true + } } }, "@babel/runtime-corejs3": { @@ -23708,6 +23739,13 @@ "requires": { "core-js-pure": "^3.30.2", "regenerator-runtime": "^0.13.11" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + } } }, "@babel/template": { @@ -36530,9 +36568,9 @@ } }, "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, "regenerator-transform": { "version": "0.15.1", diff --git a/core/web-assets/package.json b/core/web-assets/package.json index 99b95f4468ea..5e64de3aa1e9 100644 --- a/core/web-assets/package.json +++ b/core/web-assets/package.json @@ -120,7 +120,7 @@ "leaflet.markercluster": "^1.5.3", "moment": "^2.29.1", "popper.js": "^1.16.1", - "regenerator-runtime": "^0.13.9", + "regenerator-runtime": "^0.14.0", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.0.3", "ui-bootstrap4": "^3.0.7", From 3699d05a0799acd4427831575f046119281dfa73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:11:30 +0000 Subject: [PATCH 036/186] build(deps): bump org.graylog2:syslog4j from 0.9.60 to 0.9.61 Bumps [org.graylog2:syslog4j](https://github.com/graylog-labs/syslog4j-graylog2) from 0.9.60 to 0.9.61. - [Commits](https://github.com/graylog-labs/syslog4j-graylog2/compare/syslog4j-0.9.60...syslog4j-0.9.61) --- updated-dependencies: - dependency-name: org.graylog2:syslog4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- opennms-alarms/syslog-northbounder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennms-alarms/syslog-northbounder/pom.xml b/opennms-alarms/syslog-northbounder/pom.xml index 70831ca5af35..799184f5a996 100644 --- a/opennms-alarms/syslog-northbounder/pom.xml +++ b/opennms-alarms/syslog-northbounder/pom.xml @@ -59,7 +59,7 @@ org.graylog2 syslog4j - 0.9.60 + 0.9.61 commons-pool From 9e5cbdd7a510e50e151b8c1b94682a4853c72416 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:13:59 +0000 Subject: [PATCH 037/186] build(deps): bump org.apache.maven.resolver:maven-resolver-api Bumps [org.apache.maven.resolver:maven-resolver-api](https://github.com/apache/maven-resolver) from 1.9.13 to 1.9.15. - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.13...maven-resolver-1.9.15) --- updated-dependencies: - dependency-name: org.apache.maven.resolver:maven-resolver-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a56d52e84c84..943e14223ebf 100644 --- a/pom.xml +++ b/pom.xml @@ -1703,7 +1703,7 @@ 1.2.12 1.5.2.Final 3.9.4 - 1.9.13 + 1.9.15 2.2.2 3.12.4 3.10.6.Final From 5b5ce9200c09460394bb179480ed5741ab2e2191 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 12:25:07 -0400 Subject: [PATCH 038/186] stray dependency cleanup, fallout from dependabot updates --- core/web-assets/package-lock.json | 52 ------------------------------- 1 file changed, 52 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 14d263edf722..cb012f3d0b0a 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -1935,12 +1935,6 @@ "dev": true, "hasInstallScript": true }, - "node_modules/@babel/polyfill/node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", - "dev": true - }, "node_modules/@babel/preset-env": { "version": "7.22.10", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz", @@ -2107,17 +2101,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" - }, - "node_modules/@babel/runtime/node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", - "dev": true - }, "node_modules/@babel/template": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", @@ -18689,12 +18672,6 @@ "throttleit": "^1.0.0" } }, - "node_modules/request/node_modules/tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -23545,12 +23522,6 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", "dev": true - }, - "regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", - "dev": true } } }, @@ -23687,14 +23658,6 @@ "dev": true, "requires": { "regenerator-runtime": "^0.14.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", - "dev": true - } } }, "@babel/runtime-corejs3": { @@ -23704,13 +23667,6 @@ "requires": { "core-js-pure": "^3.30.2", "regenerator-runtime": "^0.14.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" - } } }, "@babel/template": { @@ -36666,14 +36622,6 @@ "tough-cookie": "^4.0.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" - }, - "dependencies": { - "tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true - } } }, "request-progress": { From caa3cdc79a35e930e8c5c40d6deebc2cb22264b5 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Aug 2023 18:46:18 +0000 Subject: [PATCH 039/186] 32.0.2 -> 32.0.3-SNAPSHOT --- .version.txt | 2 +- container/branding/pom.xml | 2 +- container/bridge/api/pom.xml | 2 +- container/bridge/pom.xml | 2 +- container/bridge/proxy/pom.xml | 2 +- container/bridge/rest/pom.xml | 2 +- container/extender/pom.xml | 2 +- container/features/pom.xml | 2 +- container/jaas-login-module/pom.xml | 2 +- container/karaf/pom.xml | 2 +- .../etc/org.ops4j.pax.logging.cfg | 6 +- container/noop-jetty-extension/pom.xml | 2 +- container/pom.xml | 2 +- container/servlet/pom.xml | 2 +- container/shared/pom.xml | 2 +- container/spring-extender/pom.xml | 2 +- core/api/pom.xml | 2 +- core/cache/pom.xml | 2 +- core/camel/pom.xml | 2 +- core/cli/pom.xml | 2 +- core/commands/pom.xml | 2 +- core/config/pom.xml | 2 +- core/criteria/pom.xml | 2 +- core/daemon/pom.xml | 2 +- core/db-install/pom.xml | 2 +- core/db/pom.xml | 2 +- core/encrypt-util/pom.xml | 2 +- core/grpc/common/pom.xml | 2 +- core/grpc/osgi/pom.xml | 2 +- core/grpc/pom.xml | 2 +- core/health/api/pom.xml | 2 +- core/health/impl/pom.xml | 2 +- core/health/pom.xml | 2 +- core/health/rest-cxf/pom.xml | 2 +- core/health/rest/pom.xml | 2 +- core/health/shell/pom.xml | 2 +- core/icmp-jna/pom.xml | 2 +- core/ipc/common/kafka-shell/pom.xml | 2 +- core/ipc/common/kafka/pom.xml | 2 +- core/ipc/common/pom.xml | 2 +- core/ipc/grpc/client/pom.xml | 2 +- core/ipc/grpc/common/pom.xml | 2 +- core/ipc/grpc/itests/pom.xml | 2 +- core/ipc/grpc/pom.xml | 2 +- core/ipc/grpc/server/pom.xml | 2 +- core/ipc/osgi/pom.xml | 2 +- core/ipc/pom.xml | 2 +- core/ipc/rpc/api/pom.xml | 2 +- core/ipc/rpc/camel/pom.xml | 2 +- core/ipc/rpc/common/pom.xml | 2 +- core/ipc/rpc/jms-impl/pom.xml | 2 +- core/ipc/rpc/kafka/pom.xml | 2 +- core/ipc/rpc/mock-impl/pom.xml | 2 +- core/ipc/rpc/pom.xml | 2 +- core/ipc/rpc/shell-commands/pom.xml | 2 +- core/ipc/rpc/utils/pom.xml | 2 +- core/ipc/rpc/xml/pom.xml | 2 +- core/ipc/sink/api/pom.xml | 2 +- core/ipc/sink/camel/client/pom.xml | 2 +- core/ipc/sink/camel/common/pom.xml | 2 +- core/ipc/sink/camel/itests/pom.xml | 2 +- core/ipc/sink/camel/pom.xml | 2 +- core/ipc/sink/camel/server/pom.xml | 2 +- core/ipc/sink/common/pom.xml | 2 +- core/ipc/sink/kafka/client/pom.xml | 2 +- core/ipc/sink/kafka/itests/pom.xml | 2 +- core/ipc/sink/kafka/pom.xml | 2 +- core/ipc/sink/kafka/server/pom.xml | 2 +- core/ipc/sink/mock-impl/pom.xml | 2 +- core/ipc/sink/off-heap/pom.xml | 2 +- core/ipc/sink/pom.xml | 2 +- core/ipc/sink/xml/pom.xml | 2 +- core/ipc/twin/api/pom.xml | 2 +- core/ipc/twin/common/pom.xml | 2 +- core/ipc/twin/grpc/common/pom.xml | 2 +- core/ipc/twin/grpc/itests/pom.xml | 2 +- core/ipc/twin/grpc/pom.xml | 2 +- core/ipc/twin/grpc/publisher/pom.xml | 2 +- core/ipc/twin/grpc/subscriber/pom.xml | 2 +- core/ipc/twin/jms/itests/pom.xml | 2 +- core/ipc/twin/jms/pom.xml | 2 +- core/ipc/twin/jms/publisher/pom.xml | 2 +- core/ipc/twin/jms/subscriber/pom.xml | 2 +- core/ipc/twin/kafka/common/pom.xml | 2 +- core/ipc/twin/kafka/itests/pom.xml | 2 +- core/ipc/twin/kafka/pom.xml | 2 +- core/ipc/twin/kafka/publisher/pom.xml | 2 +- core/ipc/twin/kafka/subscriber/pom.xml | 2 +- core/ipc/twin/memory/pom.xml | 2 +- core/ipc/twin/pom.xml | 2 +- core/ipc/twin/shell/pom.xml | 2 +- core/ipc/twin/test/pom.xml | 2 +- core/jmx/api/pom.xml | 2 +- core/jmx/impl/pom.xml | 2 +- core/jmx/pom.xml | 2 +- core/jstl-support/pom.xml | 2 +- core/lib/pom.xml | 2 +- core/logging-api/pom.xml | 2 +- core/mate/api/pom.xml | 2 +- core/mate/model/pom.xml | 2 +- core/mate/pom.xml | 2 +- core/mate/shell-commands/pom.xml | 2 +- core/pom.xml | 2 +- core/profiler/pom.xml | 2 +- core/runtime/pom.xml | 2 +- core/schema/pom.xml | 2 +- core/snmp/api/pom.xml | 2 +- core/snmp/commands/pom.xml | 2 +- core/snmp/impl-joesnmp/pom.xml | 2 +- core/snmp/impl-mock/pom.xml | 2 +- core/snmp/impl-snmp4j/pom.xml | 2 +- core/snmp/integration-tests/pom.xml | 2 +- core/snmp/joesnmp/pom.xml | 2 +- core/snmp/pom.xml | 2 +- core/snmp/profile-mapper/pom.xml | 2 +- core/snmp/proxy-rpc-impl/pom.xml | 2 +- core/snmp/proxy-rpc-tests/pom.xml | 2 +- core/soa/pom.xml | 2 +- core/spring-web/pom.xml | 2 +- core/spring/pom.xml | 2 +- core/sysprops/pom.xml | 2 +- core/tasks/pom.xml | 2 +- core/test-api/activemq/pom.xml | 2 +- core/test-api/alarms/pom.xml | 2 +- core/test-api/camel/pom.xml | 2 +- core/test-api/collection/pom.xml | 2 +- core/test-api/db/pom.xml | 2 +- core/test-api/dns/pom.xml | 2 +- core/test-api/elasticsearch/pom.xml | 2 +- core/test-api/http/pom.xml | 2 +- core/test-api/kafka/pom.xml | 2 +- core/test-api/karaf/pom.xml | 2 +- core/test-api/lib/pom.xml | 2 +- core/test-api/pom.xml | 2 +- core/test-api/rest/pom.xml | 2 +- core/test-api/schema/a/pom.xml | 2 +- core/test-api/schema/b/pom.xml | 2 +- core/test-api/schema/pom.xml | 2 +- core/test-api/services/pom.xml | 2 +- core/test-api/snmp/pom.xml | 2 +- core/test-api/ssh/pom.xml | 2 +- core/test-api/xml/pom.xml | 2 +- core/tracing/api/pom.xml | 2 +- core/tracing/jaeger-osgi/pom.xml | 2 +- core/tracing/jaeger-tracer/pom.xml | 2 +- core/tracing/pom.xml | 2 +- core/tracing/registry/pom.xml | 2 +- core/upgrade/pom.xml | 2 +- core/web-assets/package-lock.json | 4 +- core/web-assets/package.json | 2 +- core/web-assets/pom.xml | 2 +- core/web/pom.xml | 2 +- core/xml/pom.xml | 2 +- dependencies/activemq-web/pom.xml | 2 +- dependencies/activemq/pom.xml | 2 +- dependencies/asterisk/pom.xml | 2 +- dependencies/atomikos/pom.xml | 2 +- dependencies/camel-test/pom.xml | 2 +- dependencies/camel/pom.xml | 2 +- dependencies/cassandra-test/pom.xml | 2 +- dependencies/cxf/pom.xml | 2 +- dependencies/dnsjava/pom.xml | 2 +- dependencies/drools/pom.xml | 2 +- dependencies/felix/pom.xml | 2 +- dependencies/groovy/pom.xml | 2 +- dependencies/hibernate/pom.xml | 2 +- dependencies/jackson1/pom.xml | 2 +- dependencies/jackson2/pom.xml | 2 +- dependencies/jasper/pom.xml | 2 +- dependencies/jasypt/pom.xml | 2 +- dependencies/javamail/pom.xml | 2 +- dependencies/jaxb/pom.xml | 2 +- dependencies/jcifs-shaded/pom.xml | 2 +- dependencies/jcifs/pom.xml | 2 +- dependencies/jfreechart/pom.xml | 2 +- dependencies/jinterop/pom.xml | 2 +- dependencies/jmx/pom.xml | 2 +- dependencies/jna/pom.xml | 2 +- dependencies/jradius-extended/pom.xml | 2 +- dependencies/jradius/pom.xml | 2 +- dependencies/jrobin/pom.xml | 2 +- dependencies/jrrd/pom.xml | 2 +- dependencies/jrrd2/pom.xml | 2 +- dependencies/jstl/pom.xml | 2 +- dependencies/liquibase/pom.xml | 2 +- dependencies/mina/pom.xml | 2 +- dependencies/netty/pom.xml | 2 +- dependencies/newts/pom.xml | 2 +- dependencies/oia/pom.xml | 2 +- dependencies/owasp/pom.xml | 2 +- dependencies/pax-exam/pom.xml | 2 +- dependencies/pom.xml | 2 +- dependencies/quartz/pom.xml | 2 +- dependencies/servlet/pom.xml | 2 +- dependencies/smack/pom.xml | 2 +- dependencies/snmp-test/pom.xml | 2 +- dependencies/snmp/pom.xml | 2 +- dependencies/snmp4j-agent/pom.xml | 2 +- dependencies/snmp4j/pom.xml | 2 +- dependencies/spring-security-core/pom.xml | 2 +- dependencies/spring-security/pom.xml | 2 +- dependencies/spring-test/pom.xml | 2 +- dependencies/spring-web/pom.xml | 2 +- dependencies/spring/pom.xml | 2 +- dependencies/twitter4j/pom.xml | 2 +- deploy/pom.xml | 2 +- docs/antora.yml | 4 +- features/activemq/broker-api/pom.xml | 2 +- features/activemq/broker/pom.xml | 2 +- features/activemq/component/pom.xml | 2 +- features/activemq/pom.xml | 2 +- features/activemq/pool/pom.xml | 2 +- features/activemq/shell/pom.xml | 2 +- features/alarms/history/api/pom.xml | 2 +- features/alarms/history/elastic/pom.xml | 4 +- features/alarms/history/pom.xml | 2 +- features/alarms/history/rest/api/pom.xml | 2 +- features/alarms/history/rest/impl/pom.xml | 2 +- features/alarms/history/rest/pom.xml | 2 +- features/alarms/pom.xml | 2 +- features/amqp/alarm-northbounder/pom.xml | 2 +- features/amqp/common/pom.xml | 2 +- features/amqp/event-forwarder/pom.xml | 2 +- features/amqp/event-receiver/pom.xml | 2 +- features/amqp/pom.xml | 2 +- features/api-layer/common/pom.xml | 2 +- features/api-layer/core/pom.xml | 2 +- features/api-layer/dao-common/pom.xml | 2 +- features/api-layer/minion/pom.xml | 2 +- features/api-layer/pom.xml | 2 +- features/api-layer/sentinel/pom.xml | 2 +- features/bsm/daemon/pom.xml | 2 +- features/bsm/persistence/api/pom.xml | 2 +- features/bsm/persistence/impl/pom.xml | 2 +- features/bsm/persistence/pom.xml | 2 +- features/bsm/pom.xml | 2 +- features/bsm/rest/api/pom.xml | 2 +- features/bsm/rest/impl/pom.xml | 2 +- features/bsm/rest/pom.xml | 2 +- features/bsm/service/api/pom.xml | 2 +- features/bsm/service/impl/pom.xml | 2 +- features/bsm/service/pom.xml | 2 +- features/bsm/shell-commands/pom.xml | 2 +- features/bsm/test-util/pom.xml | 2 +- features/bsm/vaadin-adminpage/pom.xml | 2 +- features/collection/api/pom.xml | 2 +- features/collection/client-rpc/pom.xml | 2 +- features/collection/collectors/pom.xml | 2 +- features/collection/core/pom.xml | 2 +- features/collection/persistence-osgi/pom.xml | 2 +- features/collection/persistence-rrd/pom.xml | 2 +- features/collection/persistence-tcp/pom.xml | 2 +- features/collection/pom.xml | 2 +- features/collection/shell-commands/pom.xml | 2 +- features/collection/snmp-collector/pom.xml | 2 +- features/collection/test-api/pom.xml | 2 +- features/collection/thresholding/api/pom.xml | 2 +- features/collection/thresholding/impl/pom.xml | 2 +- .../collection/thresholding/itests/pom.xml | 2 +- features/collection/thresholding/pom.xml | 2 +- .../thresholding/thresholding-shell/pom.xml | 2 +- features/config/dao/api/pom.xml | 2 +- features/config/dao/impl/pom.xml | 2 +- features/config/dao/pom.xml | 2 +- features/config/mock/pom.xml | 2 +- features/config/osgi/cm/pom.xml | 2 +- features/config/osgi/del/pom.xml | 2 +- features/config/osgi/pom.xml | 2 +- features/config/pom.xml | 2 +- features/config/rest/api/pom.xml | 2 +- features/config/rest/impl/pom.xml | 2 +- features/config/rest/pom.xml | 2 +- features/config/service/api/pom.xml | 2 +- features/config/service/impl/pom.xml | 2 +- features/config/service/pom.xml | 2 +- features/config/test/pom.xml | 2 +- features/config/upgrade/pom.xml | 2 +- features/config/util/pom.xml | 2 +- features/container/minion/pom.xml | 2 +- features/container/pom.xml | 2 +- features/container/sentinel/pom.xml | 2 +- features/datachoices/pom.xml | 2 +- features/device-config/api/pom.xml | 2 +- .../device-config/monitor-adaptor/pom.xml | 2 +- features/device-config/monitor/pom.xml | 2 +- .../device-config/persistence/api/pom.xml | 2 +- .../device-config/persistence/impl/pom.xml | 2 +- features/device-config/persistence/pom.xml | 2 +- features/device-config/pom.xml | 2 +- features/device-config/rest/pom.xml | 2 +- features/device-config/retrieval/pom.xml | 2 +- features/device-config/service/pom.xml | 2 +- features/device-config/shell/pom.xml | 2 +- features/device-config/sink/consumer/pom.xml | 2 +- .../device-config/sink/dispatcher/pom.xml | 2 +- features/device-config/sink/module/pom.xml | 2 +- features/device-config/sink/pom.xml | 2 +- features/device-config/ssh-scripting/pom.xml | 2 +- features/device-config/tftp/pom.xml | 2 +- features/dhcpd/pom.xml | 2 +- features/discovery/pom.xml | 2 +- features/distributed/collection/pom.xml | 2 +- features/distributed/coordination/api/pom.xml | 2 +- .../distributed/coordination/common/pom.xml | 2 +- features/distributed/coordination/pom.xml | 2 +- .../distributed/coordination/shell/pom.xml | 2 +- .../coordination/zookeeper/pom.xml | 2 +- features/distributed/core/api/pom.xml | 2 +- features/distributed/core/impl/pom.xml | 2 +- features/distributed/core/jms/pom.xml | 2 +- features/distributed/core/pom.xml | 2 +- features/distributed/core/shell/pom.xml | 2 +- features/distributed/dao/api/pom.xml | 2 +- features/distributed/dao/distributed/pom.xml | 2 +- features/distributed/dao/healthcheck/pom.xml | 2 +- features/distributed/dao/impl/pom.xml | 2 +- features/distributed/dao/pom.xml | 2 +- features/distributed/dao/shell/pom.xml | 2 +- features/distributed/dao/test/pom.xml | 2 +- features/distributed/datasource/pom.xml | 2 +- .../cassandra-api/pom.xml | 2 +- .../distributed-cassandra/newts-impl/pom.xml | 2 +- .../distributed/distributed-cassandra/pom.xml | 2 +- features/distributed/kv-store/api/pom.xml | 2 +- .../kv-store/blob/blob-itests/pom.xml | 2 +- .../kv-store/blob/blob-shell/pom.xml | 2 +- .../kv-store/blob/cassandra/pom.xml | 2 +- .../kv-store/blob/in-memory/pom.xml | 2 +- .../distributed/kv-store/blob/no-op/pom.xml | 2 +- features/distributed/kv-store/blob/pom.xml | 2 +- .../kv-store/blob/postgres-impl/pom.xml | 2 +- .../kv-store/json/json-shell/pom.xml | 2 +- .../distributed/kv-store/json/noop/pom.xml | 2 +- features/distributed/kv-store/json/pom.xml | 2 +- .../kv-store/json/postgres/pom.xml | 2 +- features/distributed/kv-store/pom.xml | 2 +- .../kv-store/postgres-shared/pom.xml | 2 +- features/distributed/opennms-identity/pom.xml | 2 +- features/distributed/pom.xml | 2 +- features/distributed/service-registry/pom.xml | 2 +- features/dnsresolver/api/pom.xml | 2 +- features/dnsresolver/netty/pom.xml | 2 +- features/dnsresolver/pom.xml | 2 +- features/dnsresolver/shell/pom.xml | 2 +- features/eif-adapter/pom.xml | 2 +- features/endpoints/grafana/api/pom.xml | 2 +- features/endpoints/grafana/client/pom.xml | 2 +- .../endpoints/grafana/persistence/api/pom.xml | 2 +- .../grafana/persistence/impl/pom.xml | 2 +- .../endpoints/grafana/persistence/pom.xml | 2 +- features/endpoints/grafana/pom.xml | 2 +- features/endpoints/grafana/rest/pom.xml | 2 +- features/endpoints/grafana/service/pom.xml | 2 +- features/endpoints/pom.xml | 2 +- .../adapters/collectors/bridge/pom.xml | 2 +- .../enlinkd/adapters/collectors/cdp/pom.xml | 2 +- .../adapters/collectors/ipnettomedia/pom.xml | 2 +- .../enlinkd/adapters/collectors/isis/pom.xml | 2 +- .../enlinkd/adapters/collectors/lldp/pom.xml | 2 +- .../enlinkd/adapters/collectors/ospf/pom.xml | 2 +- features/enlinkd/adapters/collectors/pom.xml | 2 +- features/enlinkd/adapters/common/pom.xml | 2 +- .../enlinkd/adapters/discovers/bridge/pom.xml | 2 +- features/enlinkd/adapters/discovers/pom.xml | 2 +- features/enlinkd/adapters/pom.xml | 2 +- .../enlinkd/adapters/updaters/bridge/pom.xml | 2 +- .../enlinkd/adapters/updaters/cdp/pom.xml | 2 +- .../enlinkd/adapters/updaters/isis/pom.xml | 2 +- .../enlinkd/adapters/updaters/lldp/pom.xml | 2 +- .../enlinkd/adapters/updaters/nodes/pom.xml | 2 +- .../enlinkd/adapters/updaters/ospf/pom.xml | 2 +- features/enlinkd/adapters/updaters/pom.xml | 2 +- features/enlinkd/api/pom.xml | 2 +- features/enlinkd/config/pom.xml | 2 +- features/enlinkd/daemon/pom.xml | 2 +- features/enlinkd/generator/pom.xml | 2 +- features/enlinkd/persistence/api/pom.xml | 2 +- features/enlinkd/persistence/impl/pom.xml | 2 +- features/enlinkd/persistence/pom.xml | 2 +- features/enlinkd/pom.xml | 2 +- features/enlinkd/service/api/pom.xml | 2 +- features/enlinkd/service/impl/pom.xml | 2 +- features/enlinkd/service/pom.xml | 2 +- features/enlinkd/shell/pom.xml | 2 +- features/enlinkd/tests/pom.xml | 2 +- features/events/api/pom.xml | 2 +- features/events/collector/pom.xml | 2 +- features/events/daemon/pom.xml | 2 +- features/events/pom.xml | 2 +- features/events/shell-commands/pom.xml | 2 +- features/events/sink/dispatcher/pom.xml | 2 +- features/events/sink/pom.xml | 2 +- features/events/sink/shell-commands/pom.xml | 2 +- features/events/syslog/pom.xml | 2 +- features/events/traps/pom.xml | 2 +- features/executor-factory/cassandra/pom.xml | 2 +- features/executor-factory/pom.xml | 2 +- features/flows/api/pom.xml | 2 +- .../flows/classification/engine/api/pom.xml | 2 +- .../flows/classification/engine/impl/pom.xml | 2 +- features/flows/classification/engine/pom.xml | 2 +- .../classification/persistence/api/pom.xml | 2 +- .../classification/persistence/impl/pom.xml | 2 +- .../flows/classification/persistence/pom.xml | 2 +- features/flows/classification/pom.xml | 2 +- features/flows/classification/shell/pom.xml | 2 +- features/flows/elastic/pom.xml | 2 +- features/flows/itests/pom.xml | 2 +- features/flows/kafka-persistence/pom.xml | 2 +- features/flows/pom.xml | 2 +- features/flows/processing/pom.xml | 2 +- features/flows/rest/api/pom.xml | 2 +- features/flows/rest/impl/pom.xml | 2 +- features/flows/rest/pom.xml | 2 +- features/geocoder/api/pom.xml | 2 +- features/geocoder/google/pom.xml | 2 +- features/geocoder/mapquest/pom.xml | 2 +- features/geocoder/nominatim/pom.xml | 2 +- features/geocoder/pom.xml | 2 +- features/geocoder/rest/pom.xml | 2 +- features/geocoder/service/pom.xml | 2 +- features/geolocation/api/pom.xml | 2 +- features/geolocation/pom.xml | 2 +- features/geolocation/rest/pom.xml | 2 +- features/geolocation/service/pom.xml | 2 +- features/graph/api/pom.xml | 2 +- features/graph/dao/api/pom.xml | 2 +- features/graph/dao/impl/pom.xml | 2 +- features/graph/dao/pom.xml | 2 +- features/graph/domain/pom.xml | 2 +- features/graph/jung/pom.xml | 2 +- features/graph/pom.xml | 2 +- features/graph/provider/application/pom.xml | 2 +- features/graph/provider/bsm/pom.xml | 2 +- features/graph/provider/graphml/pom.xml | 2 +- features/graph/provider/legacy/pom.xml | 2 +- .../graph/provider/persistence-test/pom.xml | 2 +- features/graph/provider/pom.xml | 2 +- features/graph/provider/topology/pom.xml | 2 +- features/graph/rest/api/pom.xml | 2 +- features/graph/rest/impl/pom.xml | 2 +- features/graph/rest/pom.xml | 2 +- features/graph/service/pom.xml | 2 +- features/graph/shell/pom.xml | 2 +- features/graphml/api/pom.xml | 2 +- features/graphml/pom.xml | 2 +- features/graphml/rest/pom.xml | 2 +- features/graphml/service/pom.xml | 2 +- features/ifttt/pom.xml | 2 +- features/inmemory-timeseries-plugin/pom.xml | 2 +- features/instrumentationLogReader/pom.xml | 2 +- features/jdbc-collector/pom.xml | 2 +- features/jest/client/pom.xml | 2 +- features/jest/dependencies/pom.xml | 2 +- features/jest/feature/pom.xml | 2 +- features/jest/jest-complete-osgi/pom.xml | 2 +- features/jest/pom.xml | 2 +- features/jmx-config-generator/pom.xml | 2 +- features/juniper-tca-collector/pom.xml | 2 +- features/kafka/consumer/pom.xml | 2 +- features/kafka/pom.xml | 2 +- features/kafka/producer/pom.xml | 2 +- features/karaf-health/pom.xml | 2 +- features/measurements/api/pom.xml | 2 +- features/measurements/impl/pom.xml | 2 +- features/measurements/pom.xml | 2 +- features/measurements/rest/pom.xml | 2 +- features/measurements/shell/pom.xml | 2 +- features/mib-compiler/pom.xml | 2 +- features/minion/core/features/pom.xml | 2 +- features/minion/core/health-check/pom.xml | 2 +- features/minion/core/impl/pom.xml | 2 +- features/minion/core/pom.xml | 2 +- features/minion/core/repository/pom.xml | 2 +- features/minion/dominion/grpc-client/pom.xml | 2 +- features/minion/dominion/pom.xml | 2 +- features/minion/heartbeat/common/pom.xml | 2 +- features/minion/heartbeat/consumer/pom.xml | 2 +- features/minion/heartbeat/pom.xml | 2 +- features/minion/heartbeat/producer/pom.xml | 2 +- features/minion/pom.xml | 2 +- features/minion/repository/pom.xml | 2 +- features/minion/shell/collection/pom.xml | 2 +- features/minion/shell/poller/pom.xml | 2 +- features/minion/shell/pom.xml | 2 +- features/minion/shell/provision/pom.xml | 2 +- features/minion/status/pom.xml | 2 +- features/name-cutter/pom.xml | 2 +- features/newts-repository-converter/pom.xml | 2 +- features/newts/pom.xml | 2 +- features/notifications/api/pom.xml | 2 +- features/notifications/pom.xml | 2 +- features/notifications/shell/pom.xml | 2 +- .../notifications/ticket-strategy/pom.xml | 2 +- features/nrtg/api/pom.xml | 2 +- features/nrtg/broker/pom.xml | 2 +- features/nrtg/commander/pom.xml | 2 +- features/nrtg/jar/nrtcollector/pom.xml | 2 +- features/nrtg/jar/pom.xml | 2 +- features/nrtg/nrtbroker-jms/pom.xml | 2 +- features/nrtg/nrtbroker-local/pom.xml | 2 +- features/nrtg/nrtcollector/pom.xml | 2 +- features/nrtg/pom.xml | 2 +- features/nrtg/protocolcollector/pom.xml | 2 +- features/nrtg/protocolcollector/snmp/pom.xml | 2 +- features/nrtg/protocolcollector/tca/pom.xml | 2 +- features/nrtg/system-exports/pom.xml | 2 +- features/nrtg/web/pom.xml | 2 +- features/openconfig/api/pom.xml | 2 +- features/openconfig/common/pom.xml | 2 +- features/openconfig/pom.xml | 2 +- features/openconfig/telemetry-client/pom.xml | 2 +- features/opennms-es-rest/pom.xml | 2 +- features/opennms-osgi-core-rest/pom.xml | 2 +- features/opennms-osgi-core/pom.xml | 2 +- features/osgi-jsr223/pom.xml | 2 +- features/perspectivepoller/pom.xml | 2 +- features/poller/api/pom.xml | 2 +- features/poller/client-rpc/pom.xml | 2 +- features/poller/monitors/core/pom.xml | 2 +- features/poller/monitors/pom.xml | 2 +- features/poller/pom.xml | 2 +- features/poller/runtime/pom.xml | 2 +- features/poller/shell/pom.xml | 2 +- features/pom.xml | 2 +- features/prometheus-collector/pom.xml | 2 +- features/provisioning/api/pom.xml | 2 +- features/provisioning/lib/pom.xml | 2 +- features/provisioning/pom.xml | 2 +- features/reporting/api/pom.xml | 2 +- features/reporting/availability/pom.xml | 2 +- features/reporting/core/pom.xml | 2 +- features/reporting/dao/pom.xml | 2 +- .../reporting/jasper-reports-compiler/pom.xml | 2 +- .../reporting/jasper-reports-filter/pom.xml | 2 +- features/reporting/jasper-reports/pom.xml | 2 +- features/reporting/model/pom.xml | 2 +- features/reporting/pom.xml | 2 +- features/reporting/repository/pom.xml | 2 +- features/reporting/rest/pom.xml | 2 +- features/reporting/sdo/pom.xml | 2 +- features/request-tracker/pom.xml | 2 +- features/rest-provider/pom.xml | 2 +- features/rest/common/pom.xml | 2 +- features/rest/mapper/pom.xml | 2 +- features/rest/model/pom.xml | 2 +- features/rest/pom.xml | 2 +- features/root-webapp/pom.xml | 2 +- features/scv/api/pom.xml | 2 +- features/scv/dominion-grpc-impl/pom.xml | 2 +- features/scv/jceks-impl/pom.xml | 2 +- features/scv/pom.xml | 2 +- features/scv/rest/pom.xml | 2 +- features/scv/scvcli/pom.xml | 2 +- features/scv/shell/pom.xml | 2 +- features/search/api/pom.xml | 2 +- features/search/pom.xml | 2 +- features/search/providers/pom.xml | 2 +- features/search/rest/pom.xml | 2 +- features/search/service/pom.xml | 2 +- features/sentinel/core/pom.xml | 2 +- features/sentinel/pom.xml | 2 +- features/sentinel/repository/pom.xml | 2 +- features/situation-feedback/api/pom.xml | 2 +- features/situation-feedback/elastic/pom.xml | 2 +- features/situation-feedback/pom.xml | 2 +- features/situation-feedback/rest/api/pom.xml | 2 +- features/situation-feedback/rest/impl/pom.xml | 2 +- features/situation-feedback/rest/pom.xml | 2 +- features/springframework-security/pom.xml | 2 +- features/status/api/pom.xml | 2 +- features/status/pom.xml | 2 +- features/status/rest/pom.xml | 2 +- features/system-report/pom.xml | 2 +- features/telemetry/api/pom.xml | 2 +- features/telemetry/common/pom.xml | 2 +- features/telemetry/config/api/pom.xml | 2 +- features/telemetry/config/jaxb/pom.xml | 2 +- features/telemetry/config/pom.xml | 2 +- features/telemetry/daemon/pom.xml | 2 +- features/telemetry/distributed/common/pom.xml | 2 +- features/telemetry/distributed/minion/pom.xml | 2 +- features/telemetry/distributed/pom.xml | 2 +- .../telemetry/distributed/sentinel/pom.xml | 2 +- features/telemetry/itests/pom.xml | 2 +- features/telemetry/listeners/pom.xml | 2 +- features/telemetry/pom.xml | 2 +- features/telemetry/protocols/adapters/pom.xml | 2 +- .../telemetry/protocols/bmp/adapter/pom.xml | 2 +- .../telemetry/protocols/bmp/parser/pom.xml | 2 +- .../protocols/bmp/persistence/api/pom.xml | 2 +- .../protocols/bmp/persistence/impl/pom.xml | 2 +- .../protocols/bmp/persistence/pom.xml | 2 +- features/telemetry/protocols/bmp/pom.xml | 2 +- .../telemetry/protocols/bmp/stats/pom.xml | 2 +- .../telemetry/protocols/bmp/transport/pom.xml | 2 +- features/telemetry/protocols/common/pom.xml | 2 +- features/telemetry/protocols/flows/pom.xml | 2 +- .../protocols/graphite/adapter/pom.xml | 2 +- features/telemetry/protocols/graphite/pom.xml | 2 +- .../telemetry/protocols/jti/adapter/pom.xml | 2 +- features/telemetry/protocols/jti/pom.xml | 2 +- .../protocols/netflow/adapter/pom.xml | 2 +- .../protocols/netflow/parser/pom.xml | 2 +- features/telemetry/protocols/netflow/pom.xml | 2 +- .../protocols/netflow/transport/pom.xml | 2 +- .../telemetry/protocols/nxos/adapter/pom.xml | 2 +- features/telemetry/protocols/nxos/pom.xml | 2 +- .../protocols/openconfig/adapter/pom.xml | 2 +- .../protocols/openconfig/connector/pom.xml | 2 +- .../protocols/openconfig/itests/pom.xml | 2 +- .../telemetry/protocols/openconfig/pom.xml | 2 +- features/telemetry/protocols/pom.xml | 2 +- .../telemetry/protocols/sflow/adapter/pom.xml | 2 +- .../telemetry/protocols/sflow/parser/pom.xml | 2 +- features/telemetry/protocols/sflow/pom.xml | 2 +- features/telemetry/registry/pom.xml | 2 +- features/telemetry/shell/pom.xml | 2 +- features/themes/dashboard-theme/pom.xml | 2 +- .../themes/jmxconfiggenerator-theme/pom.xml | 2 +- .../themes/onms-default-theme/bin/pom.xml | 2 +- features/themes/onms-default-theme/pom.xml | 2 +- features/themes/pom.xml | 2 +- features/ticketing/api/pom.xml | 2 +- features/ticketing/daemon/pom.xml | 2 +- features/ticketing/drools-integration/pom.xml | 2 +- features/ticketing/inmemory/pom.xml | 2 +- features/ticketing/jira-client/pom.xml | 2 +- features/ticketing/jira-integration/pom.xml | 2 +- features/ticketing/pom.xml | 2 +- features/ticketing/rt-integration/pom.xml | 2 +- features/ticketing/tsrm-integration/pom.xml | 2 +- features/timeformat/api/pom.xml | 2 +- features/timeformat/impl/pom.xml | 2 +- features/timeformat/pom.xml | 2 +- features/timeseries-evaluate/pom.xml | 2 +- features/timeseries-shell/pom.xml | 2 +- features/timeseries/pom.xml | 2 +- features/topologies/pom.xml | 2 +- features/topologies/service/api/pom.xml | 2 +- features/topologies/service/impl/pom.xml | 2 +- features/topologies/service/pom.xml | 2 +- features/topology-map/features/pom.xml | 2 +- .../features/runtime-base/pom.xml | 2 +- .../features/runtime-graphml/pom.xml | 2 +- .../org.opennms.features.topology.api/pom.xml | 2 +- .../org.opennms.features.topology.app/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/topology-map/plugins/pom.xml | 2 +- features/topology-map/pom.xml | 2 +- features/topology-map/poms/compiled/pom.xml | 2 +- features/topology-map/poms/pom.xml | 2 +- features/topology-map/poms/wrappers/pom.xml | 2 +- features/topology-map/provision/pom.xml | 2 +- .../topology-map/themes/default-theme/pom.xml | 2 +- features/topology-map/themes/pom.xml | 2 +- features/ui-extension/pom.xml | 4 +- features/usageanalytics/api/pom.xml | 2 +- features/usageanalytics/impl/pom.xml | 2 +- features/usageanalytics/pom.xml | 4 +- features/vaadin-components/core/pom.xml | 2 +- .../extender-service/pom.xml | 2 +- features/vaadin-components/graph/pom.xml | 2 +- features/vaadin-components/header/pom.xml | 2 +- features/vaadin-components/pom.xml | 2 +- features/vaadin-components/widgetset/pom.xml | 2 +- features/vaadin-dashboard/pom.xml | 2 +- .../vaadin-dashlets/dashlet-alarms/pom.xml | 2 +- features/vaadin-dashlets/dashlet-bsm/pom.xml | 2 +- .../vaadin-dashlets/dashlet-charts/pom.xml | 2 +- .../vaadin-dashlets/dashlet-features/pom.xml | 2 +- .../vaadin-dashlets/dashlet-grafana/pom.xml | 2 +- .../vaadin-dashlets/dashlet-image/pom.xml | 2 +- features/vaadin-dashlets/dashlet-ksc/pom.xml | 2 +- features/vaadin-dashlets/dashlet-map/pom.xml | 2 +- features/vaadin-dashlets/dashlet-rrd/pom.xml | 2 +- features/vaadin-dashlets/dashlet-rtc/pom.xml | 2 +- .../vaadin-dashlets/dashlet-summary/pom.xml | 2 +- .../dashlet-surveillance/pom.xml | 2 +- .../vaadin-dashlets/dashlet-topology/pom.xml | 2 +- features/vaadin-dashlets/dashlet-url/pom.xml | 2 +- features/vaadin-dashlets/pom.xml | 2 +- features/vaadin-jmxconfiggenerator/pom.xml | 2 +- .../vaadin-snmp-events-and-metrics/pom.xml | 2 +- features/vaadin-surveillance-views/pom.xml | 2 +- features/vaadin/pom.xml | 2 +- features/wsman/pom.xml | 2 +- integration-tests/config/pom.xml | 2 +- integration-tests/pom.xml | 2 +- integration-tests/trend-configuration/pom.xml | 2 +- integrations/opennms-R/pom.xml | 2 +- .../opennms-dns-provisioning-adapter/pom.xml | 2 +- .../pom.xml | 2 +- .../opennms-jasper-extensions/pom.xml | 2 +- .../opennms-jasperstudio-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- integrations/opennms-vmware/pom.xml | 2 +- .../opennms-vtdxml-collector-handler/pom.xml | 2 +- .../pom.xml | 2 +- integrations/pom.xml | 2 +- opennms-ackd/pom.xml | 2 +- opennms-alarms/api/pom.xml | 2 +- opennms-alarms/bsf-northbounder/pom.xml | 2 +- opennms-alarms/daemon/pom.xml | 2 +- opennms-alarms/drools-northbounder/pom.xml | 2 +- opennms-alarms/email-northbounder/pom.xml | 2 +- opennms-alarms/http-northbounder/pom.xml | 2 +- opennms-alarms/integration-tests/pom.xml | 2 +- opennms-alarms/jms-northbounder/pom.xml | 2 +- opennms-alarms/pom.xml | 2 +- opennms-alarms/snmptrap-northbounder/pom.xml | 2 +- opennms-alarms/syslog-northbounder/pom.xml | 2 +- opennms-assemblies/minion/pom.xml | 2 +- opennms-assemblies/pom.xml | 2 +- opennms-assemblies/sentinel/pom.xml | 2 +- opennms-assemblies/version/pom.xml | 2 +- opennms-assemblies/webapp-full/pom.xml | 2 +- opennms-assemblies/xsds/pom.xml | 2 +- opennms-asterisk/pom.xml | 2 +- opennms-base-assembly/pom.xml | 2 +- .../src/main/filtered/etc/log4j2.xml | 80 +++++++++---------- opennms-bootstrap/pom.xml | 2 +- opennms-config-api/pom.xml | 2 +- opennms-config-dao/common-api/pom.xml | 2 +- opennms-config-dao/common-impl/pom.xml | 2 +- opennms-config-dao/poll-outages/api/pom.xml | 2 +- opennms-config-dao/poll-outages/impl/pom.xml | 2 +- .../poll-outages/itests/pom.xml | 2 +- opennms-config-dao/poll-outages/pom.xml | 2 +- opennms-config-dao/pom.xml | 2 +- opennms-config-dao/thresholding/api/pom.xml | 2 +- opennms-config-dao/thresholding/impl/pom.xml | 2 +- opennms-config-dao/thresholding/pom.xml | 2 +- opennms-config-jaxb/pom.xml | 2 +- opennms-config-model/pom.xml | 2 +- opennms-config-tester/pom.xml | 2 +- opennms-config/pom.xml | 2 +- .../drools-correlation-engine/pom.xml | 2 +- .../opennms-correlator/pom.xml | 2 +- opennms-correlation/pom.xml | 2 +- opennms-dao-api/pom.xml | 2 +- opennms-dao-mock/pom.xml | 2 +- opennms-dao/pom.xml | 2 +- .../opennms-reportd/pom.xml | 2 +- opennms-enterprise-reporting/pom.xml | 2 +- opennms-full-assembly/pom.xml | 2 +- .../assemblies/karaf/OnmsKarafTestCase.java | 2 +- opennms-icmp/commands/pom.xml | 2 +- opennms-icmp/opennms-icmp-api/pom.xml | 2 +- opennms-icmp/opennms-icmp-best/pom.xml | 2 +- opennms-icmp/opennms-icmp-jna/pom.xml | 2 +- opennms-icmp/opennms-icmp-jni/pom.xml | 2 +- opennms-icmp/opennms-icmp-jni6/pom.xml | 2 +- .../opennms-icmp-proxy-rpc-impl/pom.xml | 2 +- opennms-icmp/pom.xml | 2 +- opennms-install/pom.xml | 2 +- opennms-javamail/opennms-javamail-api/pom.xml | 2 +- opennms-javamail/pom.xml | 2 +- opennms-jetty/pom.xml | 2 +- opennms-model/pom.xml | 2 +- .../opennms-detector-bsf/pom.xml | 2 +- .../opennms-detector-datagram/pom.xml | 2 +- .../opennms-detector-dhcp/pom.xml | 2 +- .../opennms-detector-generic/pom.xml | 2 +- .../opennms-detector-jdbc/pom.xml | 2 +- .../opennms-detector-jms/pom.xml | 2 +- .../opennms-detector-jmx/pom.xml | 2 +- .../opennms-detector-lineoriented/pom.xml | 2 +- .../opennms-detector-rdns-lookup/pom.xml | 2 +- .../opennms-detector-registry/pom.xml | 2 +- .../opennms-detector-simple/pom.xml | 2 +- .../opennms-detector-ssh/pom.xml | 2 +- .../opennms-detector-web/pom.xml | 2 +- .../opennms-detectorclient-rpc/pom.xml | 2 +- .../opennms-mock-simpleserver/pom.xml | 2 +- .../opennms-provision-api/pom.xml | 2 +- .../opennms-provision-geolocation/pom.xml | 2 +- .../opennms-provision-persistence/pom.xml | 2 +- .../opennms-provision-shell/pom.xml | 2 +- opennms-provision/opennms-provisiond/pom.xml | 2 +- .../opennms-requisition-dns/pom.xml | 2 +- .../opennms-requisition-service/pom.xml | 2 +- .../opennms-snmp-scanners/pom.xml | 2 +- opennms-provision/pom.xml | 2 +- opennms-rrd/opennms-rrd-api/pom.xml | 2 +- opennms-rrd/opennms-rrd-jrobin/pom.xml | 2 +- opennms-rrd/opennms-rrd-model/pom.xml | 2 +- .../opennms-rrdtool-api/pom.xml | 2 +- opennms-rrd/opennms-rrd-rrdtool/pom.xml | 2 +- opennms-rrd/opennms-rrd-tcp/pom.xml | 2 +- opennms-rrd/pom.xml | 2 +- opennms-services/pom.xml | 2 +- opennms-taglib/pom.xml | 2 +- opennms-util/pom.xml | 2 +- opennms-web-api/pom.xml | 2 +- opennms-web-dependencies/pom.xml | 2 +- opennms-webapp-rest/pom.xml | 2 +- opennms-webapp/pom.xml | 2 +- opennms-wmi/pom.xml | 2 +- pom.xml | 4 +- protocols/cifs/pom.xml | 2 +- protocols/nsclient/pom.xml | 2 +- protocols/pom.xml | 2 +- protocols/radius/pom.xml | 2 +- protocols/selenium-monitor/pom.xml | 2 +- protocols/xml/pom.xml | 2 +- smoke-test/pom.xml | 2 +- tests/dao/pom.xml | 2 +- tests/mock-elements/pom.xml | 2 +- tests/mock-snmp-agent/pom.xml | 2 +- tests/pom.xml | 2 +- ui/pom.xml | 2 +- 831 files changed, 878 insertions(+), 878 deletions(-) diff --git a/.version.txt b/.version.txt index d68d344aebcf..555adf87a430 100644 --- a/.version.txt +++ b/.version.txt @@ -1 +1 @@ -32.0.2 \ No newline at end of file +32.0.3-SNAPSHOT \ No newline at end of file diff --git a/container/branding/pom.xml b/container/branding/pom.xml index fd4d5d4af15d..1311fcbaa38f 100644 --- a/container/branding/pom.xml +++ b/container/branding/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container diff --git a/container/bridge/api/pom.xml b/container/bridge/api/pom.xml index 89ddd57c8b0a..fea30f327a8a 100644 --- a/container/bridge/api/pom.xml +++ b/container/bridge/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.container org.opennms.container.bridge - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container.bridge org.opennms.container.bridge.api diff --git a/container/bridge/pom.xml b/container/bridge/pom.xml index 84bcd8a2681a..3200fd071b9b 100644 --- a/container/bridge/pom.xml +++ b/container/bridge/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container org.opennms.container.bridge diff --git a/container/bridge/proxy/pom.xml b/container/bridge/proxy/pom.xml index d1c4d4854aea..88fe8e94c179 100644 --- a/container/bridge/proxy/pom.xml +++ b/container/bridge/proxy/pom.xml @@ -4,7 +4,7 @@ org.opennms.container org.opennms.container.bridge - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container.bridge org.opennms.container.bridge.proxy diff --git a/container/bridge/rest/pom.xml b/container/bridge/rest/pom.xml index 98fb6c4a51f7..d7a316956461 100644 --- a/container/bridge/rest/pom.xml +++ b/container/bridge/rest/pom.xml @@ -4,7 +4,7 @@ org.opennms.container org.opennms.container.bridge - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container.bridge org.opennms.container.bridge.rest diff --git a/container/extender/pom.xml b/container/extender/pom.xml index 90c214bdfbb5..2ab616e319d4 100644 --- a/container/extender/pom.xml +++ b/container/extender/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/features/pom.xml b/container/features/pom.xml index 0b34a90124bf..e16295344d48 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.karaf diff --git a/container/jaas-login-module/pom.xml b/container/jaas-login-module/pom.xml index b1b1912037f2..4de50d3554f5 100644 --- a/container/jaas-login-module/pom.xml +++ b/container/jaas-login-module/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container diff --git a/container/karaf/pom.xml b/container/karaf/pom.xml index 9cb54d5d4331..43a65fc2920d 100644 --- a/container/karaf/pom.xml +++ b/container/karaf/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg index 15b8f6e3b3a3..46a7d3dacfee 100644 --- a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg +++ b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg @@ -70,9 +70,9 @@ log4j2.logger.opennmsTopology.level = WARN log4j2.logger.opennmsContainerBridge.name = org.opennms.container.web.bridge.rest log4j2.logger.opennmsContainerBridge.level = INFO -# OPENNMS: Display all WARN logs for our code +# OPENNMS: Display all DEBUG logs for our code log4j2.logger.opennms.name = org.opennms -log4j2.logger.opennms.level = WARN +log4j2.logger.opennms.level = DEBUG # Appenders configuration @@ -117,7 +117,7 @@ log4j2.appender.osgi.filter = * #log4j2.logger.aether.name = shaded.org.eclipse.aether #log4j2.logger.aether.level = TRACE #log4j2.logger.http-headers.name = shaded.org.apache.http.headers -#log4j2.logger.http-headers.level = WARN +#log4j2.logger.http-headers.level = DEBUG #log4j2.logger.maven.name = org.ops4j.pax.url.mvn #log4j2.logger.maven.level = TRACE diff --git a/container/noop-jetty-extension/pom.xml b/container/noop-jetty-extension/pom.xml index 8e2b359d4f3e..03d1fc85e04b 100644 --- a/container/noop-jetty-extension/pom.xml +++ b/container/noop-jetty-extension/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/pom.xml b/container/pom.xml index 757bd554b969..bd2bda272493 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/servlet/pom.xml b/container/servlet/pom.xml index e6f50985de1f..d0e5e098f4ac 100644 --- a/container/servlet/pom.xml +++ b/container/servlet/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.container diff --git a/container/shared/pom.xml b/container/shared/pom.xml index 21341a75d8d3..7de811d20953 100644 --- a/container/shared/pom.xml +++ b/container/shared/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/spring-extender/pom.xml b/container/spring-extender/pom.xml index 1b4e3ad5514e..8295aa110534 100644 --- a/container/spring-extender/pom.xml +++ b/container/spring-extender/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.container - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.container diff --git a/core/api/pom.xml b/core/api/pom.xml index 1d6caf531a85..546c2779c550 100644 --- a/core/api/pom.xml +++ b/core/api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/cache/pom.xml b/core/cache/pom.xml index dec5e59c069a..6b8ffdcd675e 100644 --- a/core/cache/pom.xml +++ b/core/cache/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/camel/pom.xml b/core/camel/pom.xml index fd09aadc5f8d..bbdc626cb2f2 100644 --- a/core/camel/pom.xml +++ b/core/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/cli/pom.xml b/core/cli/pom.xml index 35bf978d82d7..3e5a6786b51c 100644 --- a/core/cli/pom.xml +++ b/core/cli/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/commands/pom.xml b/core/commands/pom.xml index 64ff622ea9a7..e22acf8733cf 100644 --- a/core/commands/pom.xml +++ b/core/commands/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/config/pom.xml b/core/config/pom.xml index f0447e75ce4f..876432fe31be 100644 --- a/core/config/pom.xml +++ b/core/config/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/criteria/pom.xml b/core/criteria/pom.xml index d94a1ff99e8e..5d23e6a3f9ea 100644 --- a/core/criteria/pom.xml +++ b/core/criteria/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/daemon/pom.xml b/core/daemon/pom.xml index 51bd78773167..7f1a75cf909a 100644 --- a/core/daemon/pom.xml +++ b/core/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/db-install/pom.xml b/core/db-install/pom.xml index 4ad181b815bf..765afe100548 100644 --- a/core/db-install/pom.xml +++ b/core/db-install/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/db/pom.xml b/core/db/pom.xml index 49a766a39144..f135769cb71e 100644 --- a/core/db/pom.xml +++ b/core/db/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/encrypt-util/pom.xml b/core/encrypt-util/pom.xml index 18afa2b490e2..36bdf7458853 100644 --- a/core/encrypt-util/pom.xml +++ b/core/encrypt-util/pom.xml @@ -5,7 +5,7 @@ org.opennms.core org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/grpc/common/pom.xml b/core/grpc/common/pom.xml index 66c7f20c3ecc..d8201cf8584c 100644 --- a/core/grpc/common/pom.xml +++ b/core/grpc/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.grpc org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/grpc/osgi/pom.xml b/core/grpc/osgi/pom.xml index 070bda4f70bc..d598ec081468 100644 --- a/core/grpc/osgi/pom.xml +++ b/core/grpc/osgi/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.grpc org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/grpc/pom.xml b/core/grpc/pom.xml index eb1e9c175194..e1a632f37616 100644 --- a/core/grpc/pom.xml +++ b/core/grpc/pom.xml @@ -5,7 +5,7 @@ org.opennms.core org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/health/api/pom.xml b/core/health/api/pom.xml index 4c0cb0446ad5..0124c1717aec 100644 --- a/core/health/api/pom.xml +++ b/core/health/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.health - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.health diff --git a/core/health/impl/pom.xml b/core/health/impl/pom.xml index d8430223c366..7a9844e9abc3 100644 --- a/core/health/impl/pom.xml +++ b/core/health/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.health - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.health diff --git a/core/health/pom.xml b/core/health/pom.xml index 111ddc26edb1..46bbdef4b00e 100644 --- a/core/health/pom.xml +++ b/core/health/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/health/rest-cxf/pom.xml b/core/health/rest-cxf/pom.xml index 84269dcab32c..c7d4db466a47 100644 --- a/core/health/rest-cxf/pom.xml +++ b/core/health/rest-cxf/pom.xml @@ -5,7 +5,7 @@ org.opennms.core org.opennms.core.health - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.health diff --git a/core/health/rest/pom.xml b/core/health/rest/pom.xml index 07ae32b4e6a6..a3abdfd1f7a3 100644 --- a/core/health/rest/pom.xml +++ b/core/health/rest/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.health - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.health diff --git a/core/health/shell/pom.xml b/core/health/shell/pom.xml index e416f49dbd96..851d94130aeb 100644 --- a/core/health/shell/pom.xml +++ b/core/health/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.health - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.health diff --git a/core/icmp-jna/pom.xml b/core/icmp-jna/pom.xml index 0d47acbac645..f63cabfceb41 100644 --- a/core/icmp-jna/pom.xml +++ b/core/icmp-jna/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/ipc/common/kafka-shell/pom.xml b/core/ipc/common/kafka-shell/pom.xml index 37ae80307c9c..931bc6c73e97 100644 --- a/core/ipc/common/kafka-shell/pom.xml +++ b/core/ipc/common/kafka-shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.common org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/common/kafka/pom.xml b/core/ipc/common/kafka/pom.xml index 50544efb04bc..8f36bbbf7ff1 100644 --- a/core/ipc/common/kafka/pom.xml +++ b/core/ipc/common/kafka/pom.xml @@ -4,7 +4,7 @@ org.opennms.core.ipc org.opennms.core.ipc.common - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.common diff --git a/core/ipc/common/pom.xml b/core/ipc/common/pom.xml index dd8f38871798..95bd80fbed55 100644 --- a/core/ipc/common/pom.xml +++ b/core/ipc/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/grpc/client/pom.xml b/core/ipc/grpc/client/pom.xml index 394cf2b23654..85759b4858bf 100644 --- a/core/ipc/grpc/client/pom.xml +++ b/core/ipc/grpc/client/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.grpc org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/grpc/common/pom.xml b/core/ipc/grpc/common/pom.xml index 0a4f6a333b55..d2df40b6a846 100644 --- a/core/ipc/grpc/common/pom.xml +++ b/core/ipc/grpc/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.grpc org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.grpc diff --git a/core/ipc/grpc/itests/pom.xml b/core/ipc/grpc/itests/pom.xml index e660891495a8..6ec4f537c390 100644 --- a/core/ipc/grpc/itests/pom.xml +++ b/core/ipc/grpc/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.grpc org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/grpc/pom.xml b/core/ipc/grpc/pom.xml index 73720ee22f4f..e883cc6c3af5 100644 --- a/core/ipc/grpc/pom.xml +++ b/core/ipc/grpc/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 OpenNMS :: Core :: IPC :: GRPC :: Parent diff --git a/core/ipc/grpc/server/pom.xml b/core/ipc/grpc/server/pom.xml index 0269da36e38a..10bbff3afccb 100644 --- a/core/ipc/grpc/server/pom.xml +++ b/core/ipc/grpc/server/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.grpc org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.grpc diff --git a/core/ipc/osgi/pom.xml b/core/ipc/osgi/pom.xml index 19bf6a014904..b1925298c3c2 100644 --- a/core/ipc/osgi/pom.xml +++ b/core/ipc/osgi/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/pom.xml b/core/ipc/pom.xml index b8053009f93d..16f86eb1c9f6 100644 --- a/core/ipc/pom.xml +++ b/core/ipc/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/ipc/rpc/api/pom.xml b/core/ipc/rpc/api/pom.xml index cc7624b8b030..e12accab8a86 100644 --- a/core/ipc/rpc/api/pom.xml +++ b/core/ipc/rpc/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/camel/pom.xml b/core/ipc/rpc/camel/pom.xml index 49e6d93034be..eae821e78e88 100644 --- a/core/ipc/rpc/camel/pom.xml +++ b/core/ipc/rpc/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/common/pom.xml b/core/ipc/rpc/common/pom.xml index 892db8a79727..934acd27a7f9 100644 --- a/core/ipc/rpc/common/pom.xml +++ b/core/ipc/rpc/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/jms-impl/pom.xml b/core/ipc/rpc/jms-impl/pom.xml index 320a6de6cd3c..a0b104dbeeb6 100644 --- a/core/ipc/rpc/jms-impl/pom.xml +++ b/core/ipc/rpc/jms-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/kafka/pom.xml b/core/ipc/rpc/kafka/pom.xml index 93cd4f8f97ed..3848498fe41f 100644 --- a/core/ipc/rpc/kafka/pom.xml +++ b/core/ipc/rpc/kafka/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/mock-impl/pom.xml b/core/ipc/rpc/mock-impl/pom.xml index d2808e1f88df..e71017a9a5f3 100644 --- a/core/ipc/rpc/mock-impl/pom.xml +++ b/core/ipc/rpc/mock-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/pom.xml b/core/ipc/rpc/pom.xml index fb010c0ee2ac..dd70ea9328c6 100644 --- a/core/ipc/rpc/pom.xml +++ b/core/ipc/rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/rpc/shell-commands/pom.xml b/core/ipc/rpc/shell-commands/pom.xml index 8159b4691e33..453d8bde6027 100644 --- a/core/ipc/rpc/shell-commands/pom.xml +++ b/core/ipc/rpc/shell-commands/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/utils/pom.xml b/core/ipc/rpc/utils/pom.xml index 4aabbfdd2ffa..a534d71ce434 100644 --- a/core/ipc/rpc/utils/pom.xml +++ b/core/ipc/rpc/utils/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/xml/pom.xml b/core/ipc/rpc/xml/pom.xml index f450f927feec..603c4d7ac92d 100644 --- a/core/ipc/rpc/xml/pom.xml +++ b/core/ipc/rpc/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/sink/api/pom.xml b/core/ipc/sink/api/pom.xml index d555d4369c80..515ce5377d4d 100644 --- a/core/ipc/sink/api/pom.xml +++ b/core/ipc/sink/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/camel/client/pom.xml b/core/ipc/sink/camel/client/pom.xml index 060ffc1bb06e..107874b1ebe1 100644 --- a/core/ipc/sink/camel/client/pom.xml +++ b/core/ipc/sink/camel/client/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.camel - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/sink/camel/common/pom.xml b/core/ipc/sink/camel/common/pom.xml index f0eaaf0c3f9c..b90f945b72bf 100644 --- a/core/ipc/sink/camel/common/pom.xml +++ b/core/ipc/sink/camel/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.camel - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/sink/camel/itests/pom.xml b/core/ipc/sink/camel/itests/pom.xml index 9bf1c179aa9f..d254688e55f3 100644 --- a/core/ipc/sink/camel/itests/pom.xml +++ b/core/ipc/sink/camel/itests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.camel - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/sink/camel/pom.xml b/core/ipc/sink/camel/pom.xml index d67f39b88b85..c8076dad85c3 100644 --- a/core/ipc/sink/camel/pom.xml +++ b/core/ipc/sink/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/camel/server/pom.xml b/core/ipc/sink/camel/server/pom.xml index 43225522a408..5335d0405c55 100644 --- a/core/ipc/sink/camel/server/pom.xml +++ b/core/ipc/sink/camel/server/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.camel - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/sink/common/pom.xml b/core/ipc/sink/common/pom.xml index 1c77291f34e6..4f184e6d1652 100644 --- a/core/ipc/sink/common/pom.xml +++ b/core/ipc/sink/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/kafka/client/pom.xml b/core/ipc/sink/kafka/client/pom.xml index f14588330206..4f4a4ceed844 100644 --- a/core/ipc/sink/kafka/client/pom.xml +++ b/core/ipc/sink/kafka/client/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.kafka - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink.kafka diff --git a/core/ipc/sink/kafka/itests/pom.xml b/core/ipc/sink/kafka/itests/pom.xml index 87fb44e6d9ab..2ddad29b340e 100644 --- a/core/ipc/sink/kafka/itests/pom.xml +++ b/core/ipc/sink/kafka/itests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.kafka - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink.kafka diff --git a/core/ipc/sink/kafka/pom.xml b/core/ipc/sink/kafka/pom.xml index 2aa9608ff4d8..b2dd0771783b 100644 --- a/core/ipc/sink/kafka/pom.xml +++ b/core/ipc/sink/kafka/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/kafka/server/pom.xml b/core/ipc/sink/kafka/server/pom.xml index 5e150f0120d5..0dd950b5464f 100644 --- a/core/ipc/sink/kafka/server/pom.xml +++ b/core/ipc/sink/kafka/server/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc.sink org.opennms.core.ipc.sink.kafka - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink.kafka diff --git a/core/ipc/sink/mock-impl/pom.xml b/core/ipc/sink/mock-impl/pom.xml index c398cdb0341f..c468045afb92 100644 --- a/core/ipc/sink/mock-impl/pom.xml +++ b/core/ipc/sink/mock-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/off-heap/pom.xml b/core/ipc/sink/off-heap/pom.xml index b1397da3f2f9..5b6b2e504a3b 100644 --- a/core/ipc/sink/off-heap/pom.xml +++ b/core/ipc/sink/off-heap/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/pom.xml b/core/ipc/sink/pom.xml index 97ef786f3f22..4766dd39ad57 100644 --- a/core/ipc/sink/pom.xml +++ b/core/ipc/sink/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/sink/xml/pom.xml b/core/ipc/sink/xml/pom.xml index 5ef13c3f1c75..6ec448e8fad0 100644 --- a/core/ipc/sink/xml/pom.xml +++ b/core/ipc/sink/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/twin/api/pom.xml b/core/ipc/twin/api/pom.xml index a3160af1ce9f..92266ad9a52c 100644 --- a/core/ipc/twin/api/pom.xml +++ b/core/ipc/twin/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.twin diff --git a/core/ipc/twin/common/pom.xml b/core/ipc/twin/common/pom.xml index fafad44c8e4f..5b0dbb04a418 100644 --- a/core/ipc/twin/common/pom.xml +++ b/core/ipc/twin/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.twin diff --git a/core/ipc/twin/grpc/common/pom.xml b/core/ipc/twin/grpc/common/pom.xml index 4cc49c639313..11bedcd50211 100644 --- a/core/ipc/twin/grpc/common/pom.xml +++ b/core/ipc/twin/grpc/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.grpc org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/grpc/itests/pom.xml b/core/ipc/twin/grpc/itests/pom.xml index bb4e085712f3..61c941cfafb8 100644 --- a/core/ipc/twin/grpc/itests/pom.xml +++ b/core/ipc/twin/grpc/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.grpc org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/grpc/pom.xml b/core/ipc/twin/grpc/pom.xml index 1901dd05d8c5..e7888d2cca83 100644 --- a/core/ipc/twin/grpc/pom.xml +++ b/core/ipc/twin/grpc/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/grpc/publisher/pom.xml b/core/ipc/twin/grpc/publisher/pom.xml index c84fef0b7187..0a130451121e 100644 --- a/core/ipc/twin/grpc/publisher/pom.xml +++ b/core/ipc/twin/grpc/publisher/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.grpc org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/grpc/subscriber/pom.xml b/core/ipc/twin/grpc/subscriber/pom.xml index fc6b9ea2f5d3..217b5a2e6f1c 100644 --- a/core/ipc/twin/grpc/subscriber/pom.xml +++ b/core/ipc/twin/grpc/subscriber/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.grpc org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/jms/itests/pom.xml b/core/ipc/twin/jms/itests/pom.xml index f6b0d1754991..468da902105e 100644 --- a/core/ipc/twin/jms/itests/pom.xml +++ b/core/ipc/twin/jms/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.jms org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/jms/pom.xml b/core/ipc/twin/jms/pom.xml index da00653f5843..76344d1009b6 100644 --- a/core/ipc/twin/jms/pom.xml +++ b/core/ipc/twin/jms/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/jms/publisher/pom.xml b/core/ipc/twin/jms/publisher/pom.xml index 33d09e0de7e9..c35c2f656b2c 100644 --- a/core/ipc/twin/jms/publisher/pom.xml +++ b/core/ipc/twin/jms/publisher/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.jms org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/jms/subscriber/pom.xml b/core/ipc/twin/jms/subscriber/pom.xml index cd00ca6df72c..7e2b1d2a1238 100644 --- a/core/ipc/twin/jms/subscriber/pom.xml +++ b/core/ipc/twin/jms/subscriber/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.jms org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/kafka/common/pom.xml b/core/ipc/twin/kafka/common/pom.xml index 3f9aebd77313..41dd59f2603d 100644 --- a/core/ipc/twin/kafka/common/pom.xml +++ b/core/ipc/twin/kafka/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.kafka org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/kafka/itests/pom.xml b/core/ipc/twin/kafka/itests/pom.xml index 0e001015fad7..375dd95e3594 100644 --- a/core/ipc/twin/kafka/itests/pom.xml +++ b/core/ipc/twin/kafka/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.kafka org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/kafka/pom.xml b/core/ipc/twin/kafka/pom.xml index 502fdda716f8..7130654df835 100644 --- a/core/ipc/twin/kafka/pom.xml +++ b/core/ipc/twin/kafka/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/kafka/publisher/pom.xml b/core/ipc/twin/kafka/publisher/pom.xml index c54322a8372d..3416abc4944a 100644 --- a/core/ipc/twin/kafka/publisher/pom.xml +++ b/core/ipc/twin/kafka/publisher/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.kafka org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/kafka/subscriber/pom.xml b/core/ipc/twin/kafka/subscriber/pom.xml index 930485459046..482ac1b46752 100644 --- a/core/ipc/twin/kafka/subscriber/pom.xml +++ b/core/ipc/twin/kafka/subscriber/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin.kafka org.opennms.core.ipc.twin - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/memory/pom.xml b/core/ipc/twin/memory/pom.xml index 6f5a6703b054..9f11aa8085d1 100644 --- a/core/ipc/twin/memory/pom.xml +++ b/core/ipc/twin/memory/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.twin diff --git a/core/ipc/twin/pom.xml b/core/ipc/twin/pom.xml index 8ab8feee925e..f3e1897d08bd 100644 --- a/core/ipc/twin/pom.xml +++ b/core/ipc/twin/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/twin/shell/pom.xml b/core/ipc/twin/shell/pom.xml index 48bbba605905..81ecdfec1957 100644 --- a/core/ipc/twin/shell/pom.xml +++ b/core/ipc/twin/shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/ipc/twin/test/pom.xml b/core/ipc/twin/test/pom.xml index 2469481ac90b..6d9e5a2a3e97 100644 --- a/core/ipc/twin/test/pom.xml +++ b/core/ipc/twin/test/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.ipc.twin org.opennms.core.ipc - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.ipc.twin diff --git a/core/jmx/api/pom.xml b/core/jmx/api/pom.xml index 4cfe808a6cc4..3d250e5066d5 100644 --- a/core/jmx/api/pom.xml +++ b/core/jmx/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.jmx - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/jmx/impl/pom.xml b/core/jmx/impl/pom.xml index 275e5c4e7532..6d8dfc3ed5b9 100644 --- a/core/jmx/impl/pom.xml +++ b/core/jmx/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.jmx - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/jmx/pom.xml b/core/jmx/pom.xml index e529330276b6..520aaac3cbde 100644 --- a/core/jmx/pom.xml +++ b/core/jmx/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/jstl-support/pom.xml b/core/jstl-support/pom.xml index 973494cb66ec..89e62cce41f9 100644 --- a/core/jstl-support/pom.xml +++ b/core/jstl-support/pom.xml @@ -2,7 +2,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/lib/pom.xml b/core/lib/pom.xml index a8dc80d3f32e..fff0bc5aeabc 100644 --- a/core/lib/pom.xml +++ b/core/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/logging-api/pom.xml b/core/logging-api/pom.xml index 6cf2d726bf82..8c3488314e3d 100644 --- a/core/logging-api/pom.xml +++ b/core/logging-api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/mate/api/pom.xml b/core/mate/api/pom.xml index 071bf858ef31..149c9cca3402 100644 --- a/core/mate/api/pom.xml +++ b/core/mate/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.mate - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.mate diff --git a/core/mate/model/pom.xml b/core/mate/model/pom.xml index f9bd5ecccfcf..24821b80ab20 100644 --- a/core/mate/model/pom.xml +++ b/core/mate/model/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.mate - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.mate diff --git a/core/mate/pom.xml b/core/mate/pom.xml index 1e2df2d2c2ee..0d766dbd45ba 100644 --- a/core/mate/pom.xml +++ b/core/mate/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/mate/shell-commands/pom.xml b/core/mate/shell-commands/pom.xml index 18f4511422f0..da07c5ed2486 100644 --- a/core/mate/shell-commands/pom.xml +++ b/core/mate/shell-commands/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.mate - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.mate diff --git a/core/pom.xml b/core/pom.xml index fc0e30e044f7..d7ca47a63592 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/profiler/pom.xml b/core/profiler/pom.xml index 82b7d47076c5..6ea86cd6575d 100644 --- a/core/profiler/pom.xml +++ b/core/profiler/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index a9b4b183d37e..9518fcb01b0c 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/schema/pom.xml b/core/schema/pom.xml index ee30e375ecf4..b53cd25f3777 100644 --- a/core/schema/pom.xml +++ b/core/schema/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/snmp/api/pom.xml b/core/snmp/api/pom.xml index 67838870cad5..fecd52872434 100644 --- a/core/snmp/api/pom.xml +++ b/core/snmp/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/commands/pom.xml b/core/snmp/commands/pom.xml index d6eff7ba607f..c8c06553e001 100644 --- a/core/snmp/commands/pom.xml +++ b/core/snmp/commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/snmp/impl-joesnmp/pom.xml b/core/snmp/impl-joesnmp/pom.xml index 3c3af4876775..7cf9f2bdebea 100644 --- a/core/snmp/impl-joesnmp/pom.xml +++ b/core/snmp/impl-joesnmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/impl-mock/pom.xml b/core/snmp/impl-mock/pom.xml index 20dd3ff28e91..db655ac6b701 100644 --- a/core/snmp/impl-mock/pom.xml +++ b/core/snmp/impl-mock/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/impl-snmp4j/pom.xml b/core/snmp/impl-snmp4j/pom.xml index 5a6b78250700..000348e0711d 100644 --- a/core/snmp/impl-snmp4j/pom.xml +++ b/core/snmp/impl-snmp4j/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/snmp/integration-tests/pom.xml b/core/snmp/integration-tests/pom.xml index 69289afe94f1..dbcf7adb0cf0 100644 --- a/core/snmp/integration-tests/pom.xml +++ b/core/snmp/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/joesnmp/pom.xml b/core/snmp/joesnmp/pom.xml index ba7bb565e605..b9226c012bf8 100644 --- a/core/snmp/joesnmp/pom.xml +++ b/core/snmp/joesnmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/pom.xml b/core/snmp/pom.xml index 90f10c163c27..0b1bd4943ea6 100644 --- a/core/snmp/pom.xml +++ b/core/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/snmp/profile-mapper/pom.xml b/core/snmp/profile-mapper/pom.xml index 3fdccb47498e..eb0e41ffc056 100644 --- a/core/snmp/profile-mapper/pom.xml +++ b/core/snmp/profile-mapper/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.snmp org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/core/snmp/proxy-rpc-impl/pom.xml b/core/snmp/proxy-rpc-impl/pom.xml index fdda5616b3d0..0b38ca944bb1 100644 --- a/core/snmp/proxy-rpc-impl/pom.xml +++ b/core/snmp/proxy-rpc-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/snmp/proxy-rpc-tests/pom.xml b/core/snmp/proxy-rpc-tests/pom.xml index bd509a5730c1..f2b30fe965a0 100644 --- a/core/snmp/proxy-rpc-tests/pom.xml +++ b/core/snmp/proxy-rpc-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/soa/pom.xml b/core/soa/pom.xml index 5e221b4ec9ce..418e8c53ea23 100644 --- a/core/soa/pom.xml +++ b/core/soa/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/spring-web/pom.xml b/core/spring-web/pom.xml index f0ee442d6b2b..68a35dcb4cf0 100644 --- a/core/spring-web/pom.xml +++ b/core/spring-web/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/spring/pom.xml b/core/spring/pom.xml index eabf07e83503..637b04cd2167 100644 --- a/core/spring/pom.xml +++ b/core/spring/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/sysprops/pom.xml b/core/sysprops/pom.xml index 6d91c88b9c5d..971138444428 100644 --- a/core/sysprops/pom.xml +++ b/core/sysprops/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/tasks/pom.xml b/core/tasks/pom.xml index 00ad6ea962af..99f3b592e4e4 100644 --- a/core/tasks/pom.xml +++ b/core/tasks/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/test-api/activemq/pom.xml b/core/test-api/activemq/pom.xml index 5c59bd8355b0..baf0dfb12680 100644 --- a/core/test-api/activemq/pom.xml +++ b/core/test-api/activemq/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/alarms/pom.xml b/core/test-api/alarms/pom.xml index e5e8c1190f9c..3587556a9fdf 100644 --- a/core/test-api/alarms/pom.xml +++ b/core/test-api/alarms/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/camel/pom.xml b/core/test-api/camel/pom.xml index b71d90d916bc..5c7d953fe6f8 100644 --- a/core/test-api/camel/pom.xml +++ b/core/test-api/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/collection/pom.xml b/core/test-api/collection/pom.xml index a4a04f416c53..f5b2f2f65088 100644 --- a/core/test-api/collection/pom.xml +++ b/core/test-api/collection/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/db/pom.xml b/core/test-api/db/pom.xml index 26a0b9e28f3b..942ceb9086dc 100644 --- a/core/test-api/db/pom.xml +++ b/core/test-api/db/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/dns/pom.xml b/core/test-api/dns/pom.xml index 2fe1857d4f2f..cfd7238301d1 100644 --- a/core/test-api/dns/pom.xml +++ b/core/test-api/dns/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/elasticsearch/pom.xml b/core/test-api/elasticsearch/pom.xml index 4292eee16ce5..c038c189af24 100644 --- a/core/test-api/elasticsearch/pom.xml +++ b/core/test-api/elasticsearch/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/http/pom.xml b/core/test-api/http/pom.xml index 1dfa406db3b1..2757438dd773 100644 --- a/core/test-api/http/pom.xml +++ b/core/test-api/http/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/kafka/pom.xml b/core/test-api/kafka/pom.xml index 0146df344be4..c7b23b6c4689 100644 --- a/core/test-api/kafka/pom.xml +++ b/core/test-api/kafka/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/karaf/pom.xml b/core/test-api/karaf/pom.xml index a947ebb0812e..60da3d6bcb74 100644 --- a/core/test-api/karaf/pom.xml +++ b/core/test-api/karaf/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/lib/pom.xml b/core/test-api/lib/pom.xml index 3a41652fb66f..8c5998a6c45e 100644 --- a/core/test-api/lib/pom.xml +++ b/core/test-api/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/pom.xml b/core/test-api/pom.xml index 7d9ff533aeea..26a4916dda1b 100644 --- a/core/test-api/pom.xml +++ b/core/test-api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/test-api/rest/pom.xml b/core/test-api/rest/pom.xml index e19fe4f0f657..4833ea9574eb 100644 --- a/core/test-api/rest/pom.xml +++ b/core/test-api/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/schema/a/pom.xml b/core/test-api/schema/a/pom.xml index 6f068682a31f..b7e3086272b2 100644 --- a/core/test-api/schema/a/pom.xml +++ b/core/test-api/schema/a/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.test-api org.opennms.core.test-api.schema - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api.schema diff --git a/core/test-api/schema/b/pom.xml b/core/test-api/schema/b/pom.xml index d50f83223102..fd013dcda642 100644 --- a/core/test-api/schema/b/pom.xml +++ b/core/test-api/schema/b/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.test-api org.opennms.core.test-api.schema - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api.schema diff --git a/core/test-api/schema/pom.xml b/core/test-api/schema/pom.xml index b32be9744500..dbae169019ce 100644 --- a/core/test-api/schema/pom.xml +++ b/core/test-api/schema/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/services/pom.xml b/core/test-api/services/pom.xml index fb5e92e35d14..dee3e393a424 100644 --- a/core/test-api/services/pom.xml +++ b/core/test-api/services/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/snmp/pom.xml b/core/test-api/snmp/pom.xml index 6f68c9827200..359c5380a9d8 100644 --- a/core/test-api/snmp/pom.xml +++ b/core/test-api/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/ssh/pom.xml b/core/test-api/ssh/pom.xml index 822eb2193819..808236189ffb 100644 --- a/core/test-api/ssh/pom.xml +++ b/core/test-api/ssh/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/xml/pom.xml b/core/test-api/xml/pom.xml index b485a246380a..06f72bda03b5 100644 --- a/core/test-api/xml/pom.xml +++ b/core/test-api/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/tracing/api/pom.xml b/core/tracing/api/pom.xml index 15c947375e3d..9b4eb5a6256c 100644 --- a/core/tracing/api/pom.xml +++ b/core/tracing/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.tracing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.tracing diff --git a/core/tracing/jaeger-osgi/pom.xml b/core/tracing/jaeger-osgi/pom.xml index 741587b8e405..c13d951c53ba 100644 --- a/core/tracing/jaeger-osgi/pom.xml +++ b/core/tracing/jaeger-osgi/pom.xml @@ -5,7 +5,7 @@ org.opennms.core.tracing org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.tracing diff --git a/core/tracing/jaeger-tracer/pom.xml b/core/tracing/jaeger-tracer/pom.xml index a0ebfe53798f..3361c52481de 100644 --- a/core/tracing/jaeger-tracer/pom.xml +++ b/core/tracing/jaeger-tracer/pom.xml @@ -5,7 +5,7 @@ org.opennms.core org.opennms.core.tracing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.tracing diff --git a/core/tracing/pom.xml b/core/tracing/pom.xml index efa49a780604..3dd3845bf6f5 100644 --- a/core/tracing/pom.xml +++ b/core/tracing/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/tracing/registry/pom.xml b/core/tracing/registry/pom.xml index 56a39e19f88f..5740c7f210c8 100644 --- a/core/tracing/registry/pom.xml +++ b/core/tracing/registry/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.tracing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core.tracing diff --git a/core/upgrade/pom.xml b/core/upgrade/pom.xml index 494aba75ea55..7875d563f3de 100644 --- a/core/upgrade/pom.xml +++ b/core/upgrade/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index 4610eb23586e..2dce2aa60f5f 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -1,12 +1,12 @@ { "name": "opennms-core-web-assets", - "version": "32.0.2", + "version": "32.0.3-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "opennms-core-web-assets", - "version": "32.0.2", + "version": "32.0.3-SNAPSHOT", "license": "AGPL-3.0", "dependencies": { "@babel/runtime-corejs3": "^7.16.5", diff --git a/core/web-assets/package.json b/core/web-assets/package.json index 125b35d911b5..64659775ad07 100644 --- a/core/web-assets/package.json +++ b/core/web-assets/package.json @@ -1,6 +1,6 @@ { "name": "opennms-core-web-assets", - "version": "32.0.2", + "version": "32.0.3-SNAPSHOT", "description": "JavaScript Web Components for OpenNMS", "license": "AGPL-3.0", "repository": { diff --git a/core/web-assets/pom.xml b/core/web-assets/pom.xml index 7a17ea8a2618..2de476e99dcb 100644 --- a/core/web-assets/pom.xml +++ b/core/web-assets/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/web/pom.xml b/core/web/pom.xml index 090796490ab4..fa903f15125b 100644 --- a/core/web/pom.xml +++ b/core/web/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/xml/pom.xml b/core/xml/pom.xml index ab0c52b74ca4..26d2ffd86dd7 100644 --- a/core/xml/pom.xml +++ b/core/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.core diff --git a/dependencies/activemq-web/pom.xml b/dependencies/activemq-web/pom.xml index 60d0d49b9841..164a34c50438 100644 --- a/dependencies/activemq-web/pom.xml +++ b/dependencies/activemq-web/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/activemq/pom.xml b/dependencies/activemq/pom.xml index 096fa62ecf3c..c782bc7fa12e 100644 --- a/dependencies/activemq/pom.xml +++ b/dependencies/activemq/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/asterisk/pom.xml b/dependencies/asterisk/pom.xml index 207b7708dab9..99b0e659405a 100644 --- a/dependencies/asterisk/pom.xml +++ b/dependencies/asterisk/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/atomikos/pom.xml b/dependencies/atomikos/pom.xml index 3748a56554b5..c1f8c38640f5 100644 --- a/dependencies/atomikos/pom.xml +++ b/dependencies/atomikos/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/camel-test/pom.xml b/dependencies/camel-test/pom.xml index b0bfaa685f3e..dca8420b9f15 100644 --- a/dependencies/camel-test/pom.xml +++ b/dependencies/camel-test/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/camel/pom.xml b/dependencies/camel/pom.xml index 1365d3cd36bd..a85ed6023738 100644 --- a/dependencies/camel/pom.xml +++ b/dependencies/camel/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/cassandra-test/pom.xml b/dependencies/cassandra-test/pom.xml index 85806dc5d9d2..aba8b94ad035 100644 --- a/dependencies/cassandra-test/pom.xml +++ b/dependencies/cassandra-test/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/cxf/pom.xml b/dependencies/cxf/pom.xml index 31db5e98b403..e5f663342ece 100644 --- a/dependencies/cxf/pom.xml +++ b/dependencies/cxf/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/dnsjava/pom.xml b/dependencies/dnsjava/pom.xml index 36c2be73f4d7..f8699e62016a 100644 --- a/dependencies/dnsjava/pom.xml +++ b/dependencies/dnsjava/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/drools/pom.xml b/dependencies/drools/pom.xml index 7b156707fd19..b0148ba05ea1 100644 --- a/dependencies/drools/pom.xml +++ b/dependencies/drools/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/felix/pom.xml b/dependencies/felix/pom.xml index 22242e8da7a2..47f88c3d42d5 100644 --- a/dependencies/felix/pom.xml +++ b/dependencies/felix/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/groovy/pom.xml b/dependencies/groovy/pom.xml index fe77d785f83f..ff2cffc6337a 100644 --- a/dependencies/groovy/pom.xml +++ b/dependencies/groovy/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/hibernate/pom.xml b/dependencies/hibernate/pom.xml index 048871fc9dd2..35795e7a03ad 100644 --- a/dependencies/hibernate/pom.xml +++ b/dependencies/hibernate/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jackson1/pom.xml b/dependencies/jackson1/pom.xml index 464b16ea3d21..8e81e1bf9132 100644 --- a/dependencies/jackson1/pom.xml +++ b/dependencies/jackson1/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jackson2/pom.xml b/dependencies/jackson2/pom.xml index 4e822633180f..7ac215c7dc57 100644 --- a/dependencies/jackson2/pom.xml +++ b/dependencies/jackson2/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jasper/pom.xml b/dependencies/jasper/pom.xml index 7f07dd70c313..e365152e09a9 100644 --- a/dependencies/jasper/pom.xml +++ b/dependencies/jasper/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jasypt/pom.xml b/dependencies/jasypt/pom.xml index 7d7ec5b311fa..f3dfa70bfa1c 100644 --- a/dependencies/jasypt/pom.xml +++ b/dependencies/jasypt/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/javamail/pom.xml b/dependencies/javamail/pom.xml index 457a1fe8ae18..20ec7d0d0cc2 100644 --- a/dependencies/javamail/pom.xml +++ b/dependencies/javamail/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jaxb/pom.xml b/dependencies/jaxb/pom.xml index ea878d606a1d..a9bfe4f578af 100644 --- a/dependencies/jaxb/pom.xml +++ b/dependencies/jaxb/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jcifs-shaded/pom.xml b/dependencies/jcifs-shaded/pom.xml index 889a8ac58e47..9ad76d7e14e2 100644 --- a/dependencies/jcifs-shaded/pom.xml +++ b/dependencies/jcifs-shaded/pom.xml @@ -5,7 +5,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/dependencies/jcifs/pom.xml b/dependencies/jcifs/pom.xml index 63631982b2a9..778892affc25 100644 --- a/dependencies/jcifs/pom.xml +++ b/dependencies/jcifs/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jfreechart/pom.xml b/dependencies/jfreechart/pom.xml index 9c32a8f16420..624202d00915 100644 --- a/dependencies/jfreechart/pom.xml +++ b/dependencies/jfreechart/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jinterop/pom.xml b/dependencies/jinterop/pom.xml index 5407fc12170f..1bf083a7fe0f 100644 --- a/dependencies/jinterop/pom.xml +++ b/dependencies/jinterop/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jmx/pom.xml b/dependencies/jmx/pom.xml index c0a0e67375c6..560f2c98ffbd 100644 --- a/dependencies/jmx/pom.xml +++ b/dependencies/jmx/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dependencies/jna/pom.xml b/dependencies/jna/pom.xml index 66ea84ce230b..a897df727660 100644 --- a/dependencies/jna/pom.xml +++ b/dependencies/jna/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jradius-extended/pom.xml b/dependencies/jradius-extended/pom.xml index 260146d3965c..2c2798b0ce50 100644 --- a/dependencies/jradius-extended/pom.xml +++ b/dependencies/jradius-extended/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jradius/pom.xml b/dependencies/jradius/pom.xml index 174fa0046bf1..6a77f61d957c 100644 --- a/dependencies/jradius/pom.xml +++ b/dependencies/jradius/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrobin/pom.xml b/dependencies/jrobin/pom.xml index 7ecbe7a85f15..0a168f371ac0 100644 --- a/dependencies/jrobin/pom.xml +++ b/dependencies/jrobin/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrrd/pom.xml b/dependencies/jrrd/pom.xml index 62e258202be2..4f7be3e115be 100644 --- a/dependencies/jrrd/pom.xml +++ b/dependencies/jrrd/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrrd2/pom.xml b/dependencies/jrrd2/pom.xml index 6a5f31a22581..31f221ef04fe 100644 --- a/dependencies/jrrd2/pom.xml +++ b/dependencies/jrrd2/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jstl/pom.xml b/dependencies/jstl/pom.xml index 9a2934825789..60f8dc218125 100644 --- a/dependencies/jstl/pom.xml +++ b/dependencies/jstl/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/liquibase/pom.xml b/dependencies/liquibase/pom.xml index 80f24e67487d..f65739459fce 100644 --- a/dependencies/liquibase/pom.xml +++ b/dependencies/liquibase/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/mina/pom.xml b/dependencies/mina/pom.xml index fbc14dc7c3cc..eb80aebcab0b 100644 --- a/dependencies/mina/pom.xml +++ b/dependencies/mina/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/netty/pom.xml b/dependencies/netty/pom.xml index fb055d72e218..94ed8c11574f 100644 --- a/dependencies/netty/pom.xml +++ b/dependencies/netty/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/newts/pom.xml b/dependencies/newts/pom.xml index 7879823fda6b..8b8e8c30e1ea 100644 --- a/dependencies/newts/pom.xml +++ b/dependencies/newts/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/oia/pom.xml b/dependencies/oia/pom.xml index 903fa6a72198..3343d12fca5c 100644 --- a/dependencies/oia/pom.xml +++ b/dependencies/oia/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/owasp/pom.xml b/dependencies/owasp/pom.xml index 1705ae154bd2..04f7baae72dc 100644 --- a/dependencies/owasp/pom.xml +++ b/dependencies/owasp/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/pax-exam/pom.xml b/dependencies/pax-exam/pom.xml index 92eed4f204d8..0f5b574d13b8 100644 --- a/dependencies/pax-exam/pom.xml +++ b/dependencies/pax-exam/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/pom.xml b/dependencies/pom.xml index d4d6c36b3ea7..b0e05f87e9c5 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 dependencies diff --git a/dependencies/quartz/pom.xml b/dependencies/quartz/pom.xml index fd2600e43803..9f649c6e9b24 100644 --- a/dependencies/quartz/pom.xml +++ b/dependencies/quartz/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/servlet/pom.xml b/dependencies/servlet/pom.xml index 8ba232cd3406..6cec476718f7 100644 --- a/dependencies/servlet/pom.xml +++ b/dependencies/servlet/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/smack/pom.xml b/dependencies/smack/pom.xml index 0ca67528ceae..0cccc9f35363 100644 --- a/dependencies/smack/pom.xml +++ b/dependencies/smack/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp-test/pom.xml b/dependencies/snmp-test/pom.xml index f159875ae367..e0127aa5a715 100644 --- a/dependencies/snmp-test/pom.xml +++ b/dependencies/snmp-test/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp/pom.xml b/dependencies/snmp/pom.xml index fd7ff98f4269..7237ca6e788e 100644 --- a/dependencies/snmp/pom.xml +++ b/dependencies/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp4j-agent/pom.xml b/dependencies/snmp4j-agent/pom.xml index dd8d4013f619..bd7047eb372c 100644 --- a/dependencies/snmp4j-agent/pom.xml +++ b/dependencies/snmp4j-agent/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp4j/pom.xml b/dependencies/snmp4j/pom.xml index cee7d316094f..164055ef60e1 100644 --- a/dependencies/snmp4j/pom.xml +++ b/dependencies/snmp4j/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-security-core/pom.xml b/dependencies/spring-security-core/pom.xml index 0e5f2a22005b..88397db8c878 100644 --- a/dependencies/spring-security-core/pom.xml +++ b/dependencies/spring-security-core/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-security/pom.xml b/dependencies/spring-security/pom.xml index 7e27a54b6439..de7622e473de 100644 --- a/dependencies/spring-security/pom.xml +++ b/dependencies/spring-security/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-test/pom.xml b/dependencies/spring-test/pom.xml index d0dab93b01c0..56c5d5f99d29 100644 --- a/dependencies/spring-test/pom.xml +++ b/dependencies/spring-test/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-web/pom.xml b/dependencies/spring-web/pom.xml index 2cd5803dba6d..80c8795cce30 100644 --- a/dependencies/spring-web/pom.xml +++ b/dependencies/spring-web/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring/pom.xml b/dependencies/spring/pom.xml index b16120ac8c3c..83d1a3efbca4 100644 --- a/dependencies/spring/pom.xml +++ b/dependencies/spring/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/twitter4j/pom.xml b/dependencies/twitter4j/pom.xml index 48950fc8c565..7b1fb99ba16e 100644 --- a/dependencies/twitter4j/pom.xml +++ b/dependencies/twitter4j/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/deploy/pom.xml b/deploy/pom.xml index f2c4d1e41cbc..f69c9c41418a 100644 --- a/deploy/pom.xml +++ b/deploy/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-deploy diff --git a/docs/antora.yml b/docs/antora.yml index 07db87451b6b..c4bd32f428c0 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,9 +1,9 @@ name: horizon -version: '32' +version: '32-SNAPSHOT' title: Horizon asciidoc: attributes: - full-display-version: '32.0.2' + full-display-version: '32.0.3-SNAPSHOT' experimental: true source-language: asciidoc@ xrefstyle: short@ diff --git a/features/activemq/broker-api/pom.xml b/features/activemq/broker-api/pom.xml index 6ba634f0a154..0eea4a005be9 100644 --- a/features/activemq/broker-api/pom.xml +++ b/features/activemq/broker-api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 32.0.2 + 32.0.3-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/activemq/broker/pom.xml b/features/activemq/broker/pom.xml index a0d2638d2e1c..f0c54fa211d6 100644 --- a/features/activemq/broker/pom.xml +++ b/features/activemq/broker/pom.xml @@ -8,7 +8,7 @@ org.opennms.features org.opennms.features.activemq - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/activemq/component/pom.xml b/features/activemq/component/pom.xml index 38a6fc6660b8..5a3dd522549c 100644 --- a/features/activemq/component/pom.xml +++ b/features/activemq/component/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 32.0.2 + 32.0.3-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/activemq/pom.xml b/features/activemq/pom.xml index f5a2a5a8020d..6df5d98c958f 100644 --- a/features/activemq/pom.xml +++ b/features/activemq/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/activemq/pool/pom.xml b/features/activemq/pool/pom.xml index 7859762eef75..8d25484a82b8 100644 --- a/features/activemq/pool/pom.xml +++ b/features/activemq/pool/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 32.0.2 + 32.0.3-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/activemq/shell/pom.xml b/features/activemq/shell/pom.xml index e952557d2a85..bf01feb6c31b 100644 --- a/features/activemq/shell/pom.xml +++ b/features/activemq/shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 32.0.2 + 32.0.3-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/alarms/history/api/pom.xml b/features/alarms/history/api/pom.xml index 4a118b865bf0..f37e7e9d017a 100644 --- a/features/alarms/history/api/pom.xml +++ b/features/alarms/history/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.alarms org.opennms.features.alarms.history - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms.history diff --git a/features/alarms/history/elastic/pom.xml b/features/alarms/history/elastic/pom.xml index 552b0661e58d..c79c80c32ea2 100644 --- a/features/alarms/history/elastic/pom.xml +++ b/features/alarms/history/elastic/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.alarms org.opennms.features.alarms.history - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms.history @@ -186,7 +186,7 @@ org.opennms.core.test-api org.opennms.core.test-api.elasticsearch - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/alarms/history/pom.xml b/features/alarms/history/pom.xml index 35a74ee4c685..2d55f2adba19 100644 --- a/features/alarms/history/pom.xml +++ b/features/alarms/history/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms diff --git a/features/alarms/history/rest/api/pom.xml b/features/alarms/history/rest/api/pom.xml index 3d6edabc972f..681ad6cb6b05 100644 --- a/features/alarms/history/rest/api/pom.xml +++ b/features/alarms/history/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.alarms.history org.opennms.features.alarms.history.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms.history.rest diff --git a/features/alarms/history/rest/impl/pom.xml b/features/alarms/history/rest/impl/pom.xml index 7ea75451da7e..f2c1e6acc0ff 100644 --- a/features/alarms/history/rest/impl/pom.xml +++ b/features/alarms/history/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.alarms.history org.opennms.features.alarms.history.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms.history.rest diff --git a/features/alarms/history/rest/pom.xml b/features/alarms/history/rest/pom.xml index 4aab1c221863..90a49b557332 100644 --- a/features/alarms/history/rest/pom.xml +++ b/features/alarms/history/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.alarms org.opennms.features.alarms.history - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.alarms.history diff --git a/features/alarms/pom.xml b/features/alarms/pom.xml index 132569d1528c..0a0942a8fec0 100644 --- a/features/alarms/pom.xml +++ b/features/alarms/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/amqp/alarm-northbounder/pom.xml b/features/amqp/alarm-northbounder/pom.xml index 9a294df6ce39..930b1e560f03 100644 --- a/features/amqp/alarm-northbounder/pom.xml +++ b/features/amqp/alarm-northbounder/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/amqp/common/pom.xml b/features/amqp/common/pom.xml index 887e8f154037..e78f492a8754 100644 --- a/features/amqp/common/pom.xml +++ b/features/amqp/common/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/amqp/event-forwarder/pom.xml b/features/amqp/event-forwarder/pom.xml index 42dd7ccf3350..5c06c94d82a0 100644 --- a/features/amqp/event-forwarder/pom.xml +++ b/features/amqp/event-forwarder/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/amqp/event-receiver/pom.xml b/features/amqp/event-receiver/pom.xml index 1726dad7fe81..31f3de37b4d3 100644 --- a/features/amqp/event-receiver/pom.xml +++ b/features/amqp/event-receiver/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/amqp/pom.xml b/features/amqp/pom.xml index 334062bb87e1..3c2444323f45 100644 --- a/features/amqp/pom.xml +++ b/features/amqp/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/api-layer/common/pom.xml b/features/api-layer/common/pom.xml index 5ab8b1b17856..f1ead946ed2c 100644 --- a/features/api-layer/common/pom.xml +++ b/features/api-layer/common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.api-layer - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.api-layer diff --git a/features/api-layer/core/pom.xml b/features/api-layer/core/pom.xml index 4960cf5d7994..8d04e67d18e6 100644 --- a/features/api-layer/core/pom.xml +++ b/features/api-layer/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.api-layer - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.api-layer diff --git a/features/api-layer/dao-common/pom.xml b/features/api-layer/dao-common/pom.xml index 2ffc38e9460c..a66bfef982b9 100644 --- a/features/api-layer/dao-common/pom.xml +++ b/features/api-layer/dao-common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.api-layer - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.api-layer diff --git a/features/api-layer/minion/pom.xml b/features/api-layer/minion/pom.xml index 757fa6f62484..9fbe960dd131 100644 --- a/features/api-layer/minion/pom.xml +++ b/features/api-layer/minion/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.api-layer - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.api-layer diff --git a/features/api-layer/pom.xml b/features/api-layer/pom.xml index 98d89904b6d4..7b3fcf29aedb 100644 --- a/features/api-layer/pom.xml +++ b/features/api-layer/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/api-layer/sentinel/pom.xml b/features/api-layer/sentinel/pom.xml index 8974476fbe6b..4f957f021c4c 100644 --- a/features/api-layer/sentinel/pom.xml +++ b/features/api-layer/sentinel/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.api-layer - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.api-layer diff --git a/features/bsm/daemon/pom.xml b/features/bsm/daemon/pom.xml index 503411a186ff..00216de47078 100644 --- a/features/bsm/daemon/pom.xml +++ b/features/bsm/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/persistence/api/pom.xml b/features/bsm/persistence/api/pom.xml index 99385909fdf4..e515924ea682 100644 --- a/features/bsm/persistence/api/pom.xml +++ b/features/bsm/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.persistence.api diff --git a/features/bsm/persistence/impl/pom.xml b/features/bsm/persistence/impl/pom.xml index 3b4cb2aa7758..998b43c2c399 100644 --- a/features/bsm/persistence/impl/pom.xml +++ b/features/bsm/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.persistence.impl diff --git a/features/bsm/persistence/pom.xml b/features/bsm/persistence/pom.xml index 38126030442c..96b9767f6aa5 100644 --- a/features/bsm/persistence/pom.xml +++ b/features/bsm/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/pom.xml b/features/bsm/pom.xml index b611fd7d9491..40b7d83f7660 100644 --- a/features/bsm/pom.xml +++ b/features/bsm/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/bsm/rest/api/pom.xml b/features/bsm/rest/api/pom.xml index 0fd7572d1866..a11c443cc81b 100644 --- a/features/bsm/rest/api/pom.xml +++ b/features/bsm/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.rest.api diff --git a/features/bsm/rest/impl/pom.xml b/features/bsm/rest/impl/pom.xml index 05182788288a..3bffc5d10ba1 100644 --- a/features/bsm/rest/impl/pom.xml +++ b/features/bsm/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.rest.impl diff --git a/features/bsm/rest/pom.xml b/features/bsm/rest/pom.xml index 4282edea0199..2b2ef36f5532 100644 --- a/features/bsm/rest/pom.xml +++ b/features/bsm/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/service/api/pom.xml b/features/bsm/service/api/pom.xml index ff49bcfeebf4..0f9f2dcbf7c0 100644 --- a/features/bsm/service/api/pom.xml +++ b/features/bsm/service/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.service.api diff --git a/features/bsm/service/impl/pom.xml b/features/bsm/service/impl/pom.xml index 023c83eb45e1..f7002a57a508 100644 --- a/features/bsm/service/impl/pom.xml +++ b/features/bsm/service/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm.service.impl diff --git a/features/bsm/service/pom.xml b/features/bsm/service/pom.xml index 03bf618e577d..e859854b2dfd 100644 --- a/features/bsm/service/pom.xml +++ b/features/bsm/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/shell-commands/pom.xml b/features/bsm/shell-commands/pom.xml index 42da1d67fef9..2bff8f83b403 100644 --- a/features/bsm/shell-commands/pom.xml +++ b/features/bsm/shell-commands/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/test-util/pom.xml b/features/bsm/test-util/pom.xml index 6fea3feb4fcc..b4663ecfa396 100644 --- a/features/bsm/test-util/pom.xml +++ b/features/bsm/test-util/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.bsm test-util diff --git a/features/bsm/vaadin-adminpage/pom.xml b/features/bsm/vaadin-adminpage/pom.xml index 6cea8d5c28e5..189f7c783323 100644 --- a/features/bsm/vaadin-adminpage/pom.xml +++ b/features/bsm/vaadin-adminpage/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.bsm - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.bsm vaadin-adminpage diff --git a/features/collection/api/pom.xml b/features/collection/api/pom.xml index 04e70f015370..24350f2317f6 100644 --- a/features/collection/api/pom.xml +++ b/features/collection/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/client-rpc/pom.xml b/features/collection/client-rpc/pom.xml index 4134aca77df5..d2dd183cb422 100644 --- a/features/collection/client-rpc/pom.xml +++ b/features/collection/client-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/collectors/pom.xml b/features/collection/collectors/pom.xml index 630a52c1d350..de0c96954e58 100644 --- a/features/collection/collectors/pom.xml +++ b/features/collection/collectors/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/core/pom.xml b/features/collection/core/pom.xml index 6eb385143032..8137954fd42d 100644 --- a/features/collection/core/pom.xml +++ b/features/collection/core/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/persistence-osgi/pom.xml b/features/collection/persistence-osgi/pom.xml index 7bf55af11ea7..5d728809f3c3 100644 --- a/features/collection/persistence-osgi/pom.xml +++ b/features/collection/persistence-osgi/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/persistence-rrd/pom.xml b/features/collection/persistence-rrd/pom.xml index 4824f0406642..c9bce0ac3b5e 100644 --- a/features/collection/persistence-rrd/pom.xml +++ b/features/collection/persistence-rrd/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/persistence-tcp/pom.xml b/features/collection/persistence-tcp/pom.xml index b4db6f6f59fa..00696714ff16 100644 --- a/features/collection/persistence-tcp/pom.xml +++ b/features/collection/persistence-tcp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/pom.xml b/features/collection/pom.xml index 8a80c1c650d3..23b8bec88986 100644 --- a/features/collection/pom.xml +++ b/features/collection/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/collection/shell-commands/pom.xml b/features/collection/shell-commands/pom.xml index fa7b3d603370..63041b850881 100644 --- a/features/collection/shell-commands/pom.xml +++ b/features/collection/shell-commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/snmp-collector/pom.xml b/features/collection/snmp-collector/pom.xml index e47cb458b5d8..e6b32b8acf8a 100644 --- a/features/collection/snmp-collector/pom.xml +++ b/features/collection/snmp-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/test-api/pom.xml b/features/collection/test-api/pom.xml index c13be7e782da..03b2d4ca43c6 100644 --- a/features/collection/test-api/pom.xml +++ b/features/collection/test-api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/thresholding/api/pom.xml b/features/collection/thresholding/api/pom.xml index f5c064dd94ae..291a7e097042 100644 --- a/features/collection/thresholding/api/pom.xml +++ b/features/collection/thresholding/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.collection org.opennms.features.collection.thresholding - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection.thresholding.api diff --git a/features/collection/thresholding/impl/pom.xml b/features/collection/thresholding/impl/pom.xml index 4d5787517d47..cb20366f226b 100644 --- a/features/collection/thresholding/impl/pom.xml +++ b/features/collection/thresholding/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.collection org.opennms.features.collection.thresholding - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/thresholding/itests/pom.xml b/features/collection/thresholding/itests/pom.xml index 0318389df9d9..313762be87e5 100644 --- a/features/collection/thresholding/itests/pom.xml +++ b/features/collection/thresholding/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.collection.thresholding org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection.thresholding.itests diff --git a/features/collection/thresholding/pom.xml b/features/collection/thresholding/pom.xml index 78ef44e8cd31..e20290a7ea3f 100644 --- a/features/collection/thresholding/pom.xml +++ b/features/collection/thresholding/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/thresholding/thresholding-shell/pom.xml b/features/collection/thresholding/thresholding-shell/pom.xml index 374443ee1aee..8720063dfef3 100644 --- a/features/collection/thresholding/thresholding-shell/pom.xml +++ b/features/collection/thresholding/thresholding-shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.collection.thresholding org.opennms.features.collection - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.collection.thresholding.shell diff --git a/features/config/dao/api/pom.xml b/features/config/dao/api/pom.xml index 7b4d638da777..9cb67a41f36b 100644 --- a/features/config/dao/api/pom.xml +++ b/features/config/dao/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.config org.opennms.features.config.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.dao diff --git a/features/config/dao/impl/pom.xml b/features/config/dao/impl/pom.xml index efa0840b81f0..b5be8d735ce5 100644 --- a/features/config/dao/impl/pom.xml +++ b/features/config/dao/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.config org.opennms.features.config.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.dao diff --git a/features/config/dao/pom.xml b/features/config/dao/pom.xml index 385a6842afb0..cc3e4c8b260e 100644 --- a/features/config/dao/pom.xml +++ b/features/config/dao/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/mock/pom.xml b/features/config/mock/pom.xml index 92052648e59e..2618d908b076 100644 --- a/features/config/mock/pom.xml +++ b/features/config/mock/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/osgi/cm/pom.xml b/features/config/osgi/cm/pom.xml index 855f869f0245..7059393fcb37 100644 --- a/features/config/osgi/cm/pom.xml +++ b/features/config/osgi/cm/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.config org.opennms.features.config.osgi - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.osgi diff --git a/features/config/osgi/del/pom.xml b/features/config/osgi/del/pom.xml index 85c36546e6bb..3401e40fb5f9 100644 --- a/features/config/osgi/del/pom.xml +++ b/features/config/osgi/del/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.config org.opennms.features.config.osgi - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.osgi diff --git a/features/config/osgi/pom.xml b/features/config/osgi/pom.xml index d3fba26202c6..f69740d4745f 100644 --- a/features/config/osgi/pom.xml +++ b/features/config/osgi/pom.xml @@ -6,7 +6,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/pom.xml b/features/config/pom.xml index a5526552be06..5088e5e31c0e 100644 --- a/features/config/pom.xml +++ b/features/config/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/config/rest/api/pom.xml b/features/config/rest/api/pom.xml index ffbe653e88d6..ae6c4f9e7bf5 100644 --- a/features/config/rest/api/pom.xml +++ b/features/config/rest/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.config org.opennms.features.config.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.rest diff --git a/features/config/rest/impl/pom.xml b/features/config/rest/impl/pom.xml index d79e01972431..3a0746f9028b 100644 --- a/features/config/rest/impl/pom.xml +++ b/features/config/rest/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.config org.opennms.features.config.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.rest diff --git a/features/config/rest/pom.xml b/features/config/rest/pom.xml index 56dde47788d8..300bf7b48851 100644 --- a/features/config/rest/pom.xml +++ b/features/config/rest/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/service/api/pom.xml b/features/config/service/api/pom.xml index 338ac0ed4893..dc27567d9ea1 100644 --- a/features/config/service/api/pom.xml +++ b/features/config/service/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.config org.opennms.features.config.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.service diff --git a/features/config/service/impl/pom.xml b/features/config/service/impl/pom.xml index daeb6cb9f9e3..f9ff78ea941d 100644 --- a/features/config/service/impl/pom.xml +++ b/features/config/service/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.config org.opennms.features.config.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config.service diff --git a/features/config/service/pom.xml b/features/config/service/pom.xml index 90004c307989..e592d34dbda1 100644 --- a/features/config/service/pom.xml +++ b/features/config/service/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/test/pom.xml b/features/config/test/pom.xml index 268f6cbcdd8d..30fe5b035c01 100644 --- a/features/config/test/pom.xml +++ b/features/config/test/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/upgrade/pom.xml b/features/config/upgrade/pom.xml index 7d77072eae1f..2fdbed3ff058 100644 --- a/features/config/upgrade/pom.xml +++ b/features/config/upgrade/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/config/util/pom.xml b/features/config/util/pom.xml index c5abb8214302..8a6782f62862 100644 --- a/features/config/util/pom.xml +++ b/features/config/util/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.config diff --git a/features/container/minion/pom.xml b/features/container/minion/pom.xml index 6d8f6811e0df..7283801872d5 100644 --- a/features/container/minion/pom.xml +++ b/features/container/minion/pom.xml @@ -4,7 +4,7 @@ org.opennms.features container-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.container diff --git a/features/container/pom.xml b/features/container/pom.xml index 64481e1bc957..c4b85a95aec0 100644 --- a/features/container/pom.xml +++ b/features/container/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/container/sentinel/pom.xml b/features/container/sentinel/pom.xml index f99d5a482946..4af44e73f316 100644 --- a/features/container/sentinel/pom.xml +++ b/features/container/sentinel/pom.xml @@ -4,7 +4,7 @@ org.opennms.features container-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.container diff --git a/features/datachoices/pom.xml b/features/datachoices/pom.xml index 862120c9700d..3919c7570090 100644 --- a/features/datachoices/pom.xml +++ b/features/datachoices/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features datachoices diff --git a/features/device-config/api/pom.xml b/features/device-config/api/pom.xml index f171fa974adc..90314ee7692f 100644 --- a/features/device-config/api/pom.xml +++ b/features/device-config/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/monitor-adaptor/pom.xml b/features/device-config/monitor-adaptor/pom.xml index 50ecffa3b39e..d585296732f0 100644 --- a/features/device-config/monitor-adaptor/pom.xml +++ b/features/device-config/monitor-adaptor/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/monitor/pom.xml b/features/device-config/monitor/pom.xml index 504d603b0d01..4550022bda53 100644 --- a/features/device-config/monitor/pom.xml +++ b/features/device-config/monitor/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/persistence/api/pom.xml b/features/device-config/persistence/api/pom.xml index a702a88d6fae..c804f9a65928 100644 --- a/features/device-config/persistence/api/pom.xml +++ b/features/device-config/persistence/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config.persistence org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/persistence/impl/pom.xml b/features/device-config/persistence/impl/pom.xml index f057cf0d3fff..1f9af304bafe 100644 --- a/features/device-config/persistence/impl/pom.xml +++ b/features/device-config/persistence/impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config.persistence org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/persistence/pom.xml b/features/device-config/persistence/pom.xml index 1e77d22cc226..50b64c42021c 100644 --- a/features/device-config/persistence/pom.xml +++ b/features/device-config/persistence/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/pom.xml b/features/device-config/pom.xml index 72d59762730f..8725332d4e71 100644 --- a/features/device-config/pom.xml +++ b/features/device-config/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/rest/pom.xml b/features/device-config/rest/pom.xml index ccbf92382008..37ff0c2cb1fd 100644 --- a/features/device-config/rest/pom.xml +++ b/features/device-config/rest/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/retrieval/pom.xml b/features/device-config/retrieval/pom.xml index f0bc72b2b1a2..51e89d7832f7 100644 --- a/features/device-config/retrieval/pom.xml +++ b/features/device-config/retrieval/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.device-config diff --git a/features/device-config/service/pom.xml b/features/device-config/service/pom.xml index 14190c3af9c5..c966079516db 100644 --- a/features/device-config/service/pom.xml +++ b/features/device-config/service/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/shell/pom.xml b/features/device-config/shell/pom.xml index d198c58c9dfe..afebf66efab9 100644 --- a/features/device-config/shell/pom.xml +++ b/features/device-config/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.device-config diff --git a/features/device-config/sink/consumer/pom.xml b/features/device-config/sink/consumer/pom.xml index 5d31269dbea5..42702172386c 100644 --- a/features/device-config/sink/consumer/pom.xml +++ b/features/device-config/sink/consumer/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config.sink org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/sink/dispatcher/pom.xml b/features/device-config/sink/dispatcher/pom.xml index bae34ba3e97f..2c10a5f2667a 100644 --- a/features/device-config/sink/dispatcher/pom.xml +++ b/features/device-config/sink/dispatcher/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config.sink org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/sink/module/pom.xml b/features/device-config/sink/module/pom.xml index ca0a7d68ffa0..7c247614dfcc 100644 --- a/features/device-config/sink/module/pom.xml +++ b/features/device-config/sink/module/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config.sink org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/sink/pom.xml b/features/device-config/sink/pom.xml index bb9c72a93f1c..c131ad3ebb3a 100644 --- a/features/device-config/sink/pom.xml +++ b/features/device-config/sink/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.device-config org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/device-config/ssh-scripting/pom.xml b/features/device-config/ssh-scripting/pom.xml index 00fdd59e5229..ebf265a711c4 100644 --- a/features/device-config/ssh-scripting/pom.xml +++ b/features/device-config/ssh-scripting/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.device-config diff --git a/features/device-config/tftp/pom.xml b/features/device-config/tftp/pom.xml index bd08b21aa540..5b251a6fa256 100644 --- a/features/device-config/tftp/pom.xml +++ b/features/device-config/tftp/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.device-config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.device-config diff --git a/features/dhcpd/pom.xml b/features/dhcpd/pom.xml index 970bd89604a1..3e10493e5f54 100644 --- a/features/dhcpd/pom.xml +++ b/features/dhcpd/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/discovery/pom.xml b/features/discovery/pom.xml index 7736cb8fb7af..076c204d227e 100644 --- a/features/discovery/pom.xml +++ b/features/discovery/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/distributed/collection/pom.xml b/features/distributed/collection/pom.xml index da747a78653a..7433d08fbd6c 100644 --- a/features/distributed/collection/pom.xml +++ b/features/distributed/collection/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/coordination/api/pom.xml b/features/distributed/coordination/api/pom.xml index 69af44acc9bf..22e565b1025f 100644 --- a/features/distributed/coordination/api/pom.xml +++ b/features/distributed/coordination/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed coordination-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 coordination-api diff --git a/features/distributed/coordination/common/pom.xml b/features/distributed/coordination/common/pom.xml index 9c0543e57cfa..900e7a0b10ab 100644 --- a/features/distributed/coordination/common/pom.xml +++ b/features/distributed/coordination/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed coordination-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 coordination-common diff --git a/features/distributed/coordination/pom.xml b/features/distributed/coordination/pom.xml index 2c34d3914c27..ff212ad63bf4 100644 --- a/features/distributed/coordination/pom.xml +++ b/features/distributed/coordination/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 coordination-parent diff --git a/features/distributed/coordination/shell/pom.xml b/features/distributed/coordination/shell/pom.xml index 307271c4aeb2..9a996487a3c5 100644 --- a/features/distributed/coordination/shell/pom.xml +++ b/features/distributed/coordination/shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed coordination-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 coordination-shell diff --git a/features/distributed/coordination/zookeeper/pom.xml b/features/distributed/coordination/zookeeper/pom.xml index 319eb243e9cb..c6d2b18023ff 100644 --- a/features/distributed/coordination/zookeeper/pom.xml +++ b/features/distributed/coordination/zookeeper/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed coordination-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 coordination-zookeeper diff --git a/features/distributed/core/api/pom.xml b/features/distributed/core/api/pom.xml index 826fde60c5ba..9c8c0b68c46e 100644 --- a/features/distributed/core/api/pom.xml +++ b/features/distributed/core/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-api diff --git a/features/distributed/core/impl/pom.xml b/features/distributed/core/impl/pom.xml index aaad3d24ab7c..4322e5ab9402 100644 --- a/features/distributed/core/impl/pom.xml +++ b/features/distributed/core/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-impl diff --git a/features/distributed/core/jms/pom.xml b/features/distributed/core/jms/pom.xml index acd17b58d61b..f5bf66c50fa0 100644 --- a/features/distributed/core/jms/pom.xml +++ b/features/distributed/core/jms/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 jms diff --git a/features/distributed/core/pom.xml b/features/distributed/core/pom.xml index 6f1907eb1079..346d60ddf6c8 100644 --- a/features/distributed/core/pom.xml +++ b/features/distributed/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-parent diff --git a/features/distributed/core/shell/pom.xml b/features/distributed/core/shell/pom.xml index 322b336c5dcc..4eda14bc7adb 100644 --- a/features/distributed/core/shell/pom.xml +++ b/features/distributed/core/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 shell diff --git a/features/distributed/dao/api/pom.xml b/features/distributed/dao/api/pom.xml index 76adcae54b3e..d021e9826edc 100644 --- a/features/distributed/dao/api/pom.xml +++ b/features/distributed/dao/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/dao/distributed/pom.xml b/features/distributed/dao/distributed/pom.xml index a868aa03ee04..8ebb2f0d9404 100644 --- a/features/distributed/dao/distributed/pom.xml +++ b/features/distributed/dao/distributed/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/dao/healthcheck/pom.xml b/features/distributed/dao/healthcheck/pom.xml index e1f344243ea3..e55f5269f3f8 100644 --- a/features/distributed/dao/healthcheck/pom.xml +++ b/features/distributed/dao/healthcheck/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/dao/impl/pom.xml b/features/distributed/dao/impl/pom.xml index 52acd93c5ec5..12150663b1ef 100644 --- a/features/distributed/dao/impl/pom.xml +++ b/features/distributed/dao/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/dao/pom.xml b/features/distributed/dao/pom.xml index 0d721c59ba08..fb2274229bd2 100644 --- a/features/distributed/dao/pom.xml +++ b/features/distributed/dao/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.dao diff --git a/features/distributed/dao/shell/pom.xml b/features/distributed/dao/shell/pom.xml index 239e837466a6..293d1f1a571b 100644 --- a/features/distributed/dao/shell/pom.xml +++ b/features/distributed/dao/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/dao/test/pom.xml b/features/distributed/dao/test/pom.xml index ccb11d2594a2..1158e561dc27 100644 --- a/features/distributed/dao/test/pom.xml +++ b/features/distributed/dao/test/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.distributed org.opennms.features.distributed.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/datasource/pom.xml b/features/distributed/datasource/pom.xml index 6789834c926f..08927c568a1f 100644 --- a/features/distributed/datasource/pom.xml +++ b/features/distributed/datasource/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/distributed-cassandra/cassandra-api/pom.xml b/features/distributed/distributed-cassandra/cassandra-api/pom.xml index 14aa44128896..469fc5db389c 100644 --- a/features/distributed/distributed-cassandra/cassandra-api/pom.xml +++ b/features/distributed/distributed-cassandra/cassandra-api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.cassandra org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.cassandra.api diff --git a/features/distributed/distributed-cassandra/newts-impl/pom.xml b/features/distributed/distributed-cassandra/newts-impl/pom.xml index 51ac432df258..ed9365b36c09 100644 --- a/features/distributed/distributed-cassandra/newts-impl/pom.xml +++ b/features/distributed/distributed-cassandra/newts-impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.cassandra org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.cassandra.newts-impl diff --git a/features/distributed/distributed-cassandra/pom.xml b/features/distributed/distributed-cassandra/pom.xml index c86cce4dd1aa..ead7e1ea403f 100644 --- a/features/distributed/distributed-cassandra/pom.xml +++ b/features/distributed/distributed-cassandra/pom.xml @@ -5,7 +5,7 @@ distributed-parent org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.cassandra diff --git a/features/distributed/kv-store/api/pom.xml b/features/distributed/kv-store/api/pom.xml index 20a56ee6b38f..bf5ac8610018 100644 --- a/features/distributed/kv-store/api/pom.xml +++ b/features/distributed/kv-store/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.api diff --git a/features/distributed/kv-store/blob/blob-itests/pom.xml b/features/distributed/kv-store/blob/blob-itests/pom.xml index 7e5a5973f766..3faa55706945 100644 --- a/features/distributed/kv-store/blob/blob-itests/pom.xml +++ b/features/distributed/kv-store/blob/blob-itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob.itests diff --git a/features/distributed/kv-store/blob/blob-shell/pom.xml b/features/distributed/kv-store/blob/blob-shell/pom.xml index 9dac530e9c2b..56ce68ae71bb 100644 --- a/features/distributed/kv-store/blob/blob-shell/pom.xml +++ b/features/distributed/kv-store/blob/blob-shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob.shell diff --git a/features/distributed/kv-store/blob/cassandra/pom.xml b/features/distributed/kv-store/blob/cassandra/pom.xml index 4203c9c42248..d3bf188ab93d 100644 --- a/features/distributed/kv-store/blob/cassandra/pom.xml +++ b/features/distributed/kv-store/blob/cassandra/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob.cassandra diff --git a/features/distributed/kv-store/blob/in-memory/pom.xml b/features/distributed/kv-store/blob/in-memory/pom.xml index a936710a7f4a..b18f5a593c2e 100644 --- a/features/distributed/kv-store/blob/in-memory/pom.xml +++ b/features/distributed/kv-store/blob/in-memory/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob.in-memory diff --git a/features/distributed/kv-store/blob/no-op/pom.xml b/features/distributed/kv-store/blob/no-op/pom.xml index e59627eee6dd..12c9e6472826 100644 --- a/features/distributed/kv-store/blob/no-op/pom.xml +++ b/features/distributed/kv-store/blob/no-op/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob.no-op diff --git a/features/distributed/kv-store/blob/pom.xml b/features/distributed/kv-store/blob/pom.xml index e105dff4e7c3..957e279f4631 100644 --- a/features/distributed/kv-store/blob/pom.xml +++ b/features/distributed/kv-store/blob/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.blob diff --git a/features/distributed/kv-store/blob/postgres-impl/pom.xml b/features/distributed/kv-store/blob/postgres-impl/pom.xml index f6be3295943c..47230f027295 100644 --- a/features/distributed/kv-store/blob/postgres-impl/pom.xml +++ b/features/distributed/kv-store/blob/postgres-impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.blob org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 bundle diff --git a/features/distributed/kv-store/json/json-shell/pom.xml b/features/distributed/kv-store/json/json-shell/pom.xml index a6d5d12815e0..4f9198513d8f 100644 --- a/features/distributed/kv-store/json/json-shell/pom.xml +++ b/features/distributed/kv-store/json/json-shell/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.json org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.json.shell diff --git a/features/distributed/kv-store/json/noop/pom.xml b/features/distributed/kv-store/json/noop/pom.xml index 9f91a9c488a7..4ef4ea8a427b 100644 --- a/features/distributed/kv-store/json/noop/pom.xml +++ b/features/distributed/kv-store/json/noop/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.json org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.json.noop diff --git a/features/distributed/kv-store/json/pom.xml b/features/distributed/kv-store/json/pom.xml index cd0b62e2c3b4..dee89e178400 100644 --- a/features/distributed/kv-store/json/pom.xml +++ b/features/distributed/kv-store/json/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.json diff --git a/features/distributed/kv-store/json/postgres/pom.xml b/features/distributed/kv-store/json/postgres/pom.xml index e6776458c2ac..11fb5a13b3f2 100644 --- a/features/distributed/kv-store/json/postgres/pom.xml +++ b/features/distributed/kv-store/json/postgres/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store.json org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.distributed.kv-store.json.postgres 4.0.0 diff --git a/features/distributed/kv-store/pom.xml b/features/distributed/kv-store/pom.xml index 7b9b88347008..853f15569511 100644 --- a/features/distributed/kv-store/pom.xml +++ b/features/distributed/kv-store/pom.xml @@ -5,7 +5,7 @@ distributed-parent org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/distributed/kv-store/postgres-shared/pom.xml b/features/distributed/kv-store/postgres-shared/pom.xml index 4f336d43cdef..bc3bc235d922 100644 --- a/features/distributed/kv-store/postgres-shared/pom.xml +++ b/features/distributed/kv-store/postgres-shared/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed.kv-store org.opennms.features.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed.kv-store.postgres-shared diff --git a/features/distributed/opennms-identity/pom.xml b/features/distributed/opennms-identity/pom.xml index 0d176a5ef82a..9526503b2d50 100644 --- a/features/distributed/opennms-identity/pom.xml +++ b/features/distributed/opennms-identity/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/distributed/pom.xml b/features/distributed/pom.xml index ba850fb6285f..3d6473e85bf5 100644 --- a/features/distributed/pom.xml +++ b/features/distributed/pom.xml @@ -8,7 +8,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/distributed/service-registry/pom.xml b/features/distributed/service-registry/pom.xml index c4de57730b48..007c18c3ec72 100644 --- a/features/distributed/service-registry/pom.xml +++ b/features/distributed/service-registry/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.distributed distributed-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.distributed diff --git a/features/dnsresolver/api/pom.xml b/features/dnsresolver/api/pom.xml index cd41d45b276d..abf4d90fb8be 100644 --- a/features/dnsresolver/api/pom.xml +++ b/features/dnsresolver/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.dnsresolver - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.dnsresolver diff --git a/features/dnsresolver/netty/pom.xml b/features/dnsresolver/netty/pom.xml index 02c1d0d3c4e7..af65057e1a23 100644 --- a/features/dnsresolver/netty/pom.xml +++ b/features/dnsresolver/netty/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.dnsresolver - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.dnsresolver diff --git a/features/dnsresolver/pom.xml b/features/dnsresolver/pom.xml index 8a6c40f024d6..61f1ff7912a3 100644 --- a/features/dnsresolver/pom.xml +++ b/features/dnsresolver/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/dnsresolver/shell/pom.xml b/features/dnsresolver/shell/pom.xml index 155d00da6d7e..1c7ff050b1f5 100644 --- a/features/dnsresolver/shell/pom.xml +++ b/features/dnsresolver/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.dnsresolver - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.dnsresolver diff --git a/features/eif-adapter/pom.xml b/features/eif-adapter/pom.xml index 722d83c27a97..6683147342f3 100644 --- a/features/eif-adapter/pom.xml +++ b/features/eif-adapter/pom.xml @@ -9,7 +9,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/endpoints/grafana/api/pom.xml b/features/endpoints/grafana/api/pom.xml index 64552cec5129..c93316a80ef7 100644 --- a/features/endpoints/grafana/api/pom.xml +++ b/features/endpoints/grafana/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints org.opennms.features.endpoints.grafana - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana diff --git a/features/endpoints/grafana/client/pom.xml b/features/endpoints/grafana/client/pom.xml index db73b40b0fae..c1d161dd1596 100644 --- a/features/endpoints/grafana/client/pom.xml +++ b/features/endpoints/grafana/client/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints org.opennms.features.endpoints.grafana - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana diff --git a/features/endpoints/grafana/persistence/api/pom.xml b/features/endpoints/grafana/persistence/api/pom.xml index 530f9ab659b7..6483edc6393e 100644 --- a/features/endpoints/grafana/persistence/api/pom.xml +++ b/features/endpoints/grafana/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints.grafana org.opennms.features.endpoints.grafana.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana.persistence diff --git a/features/endpoints/grafana/persistence/impl/pom.xml b/features/endpoints/grafana/persistence/impl/pom.xml index 2925b649722d..85194c255bd9 100644 --- a/features/endpoints/grafana/persistence/impl/pom.xml +++ b/features/endpoints/grafana/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints.grafana org.opennms.features.endpoints.grafana.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana.persistence diff --git a/features/endpoints/grafana/persistence/pom.xml b/features/endpoints/grafana/persistence/pom.xml index 3b084810eff4..c99a7680cba6 100644 --- a/features/endpoints/grafana/persistence/pom.xml +++ b/features/endpoints/grafana/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints org.opennms.features.endpoints.grafana - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana diff --git a/features/endpoints/grafana/pom.xml b/features/endpoints/grafana/pom.xml index dac7a662c267..3fefd71b1059 100644 --- a/features/endpoints/grafana/pom.xml +++ b/features/endpoints/grafana/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.endpoints - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints diff --git a/features/endpoints/grafana/rest/pom.xml b/features/endpoints/grafana/rest/pom.xml index 84bf70ecedcf..25e89f474a1e 100644 --- a/features/endpoints/grafana/rest/pom.xml +++ b/features/endpoints/grafana/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints org.opennms.features.endpoints.grafana - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana diff --git a/features/endpoints/grafana/service/pom.xml b/features/endpoints/grafana/service/pom.xml index 6d19cdfa40e2..fd4ca5abfd71 100644 --- a/features/endpoints/grafana/service/pom.xml +++ b/features/endpoints/grafana/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.endpoints org.opennms.features.endpoints.grafana - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.endpoints.grafana diff --git a/features/endpoints/pom.xml b/features/endpoints/pom.xml index eb6f470626c7..eae6cbe8083d 100644 --- a/features/endpoints/pom.xml +++ b/features/endpoints/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/enlinkd/adapters/collectors/bridge/pom.xml b/features/enlinkd/adapters/collectors/bridge/pom.xml index c26a11050297..3cedf68e6500 100644 --- a/features/enlinkd/adapters/collectors/bridge/pom.xml +++ b/features/enlinkd/adapters/collectors/bridge/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.bridge diff --git a/features/enlinkd/adapters/collectors/cdp/pom.xml b/features/enlinkd/adapters/collectors/cdp/pom.xml index 13b37dec1eca..15206f725c78 100644 --- a/features/enlinkd/adapters/collectors/cdp/pom.xml +++ b/features/enlinkd/adapters/collectors/cdp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.cdp diff --git a/features/enlinkd/adapters/collectors/ipnettomedia/pom.xml b/features/enlinkd/adapters/collectors/ipnettomedia/pom.xml index b0155d95ecf7..c9598606577a 100644 --- a/features/enlinkd/adapters/collectors/ipnettomedia/pom.xml +++ b/features/enlinkd/adapters/collectors/ipnettomedia/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.ipnettomedia diff --git a/features/enlinkd/adapters/collectors/isis/pom.xml b/features/enlinkd/adapters/collectors/isis/pom.xml index 2cf38adf52f8..63921946f4fd 100644 --- a/features/enlinkd/adapters/collectors/isis/pom.xml +++ b/features/enlinkd/adapters/collectors/isis/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.isis diff --git a/features/enlinkd/adapters/collectors/lldp/pom.xml b/features/enlinkd/adapters/collectors/lldp/pom.xml index 4b72a069ae81..efd4ba8cdc1b 100644 --- a/features/enlinkd/adapters/collectors/lldp/pom.xml +++ b/features/enlinkd/adapters/collectors/lldp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.lldp diff --git a/features/enlinkd/adapters/collectors/ospf/pom.xml b/features/enlinkd/adapters/collectors/ospf/pom.xml index e97dd21a6ea3..77aad27a5401 100644 --- a/features/enlinkd/adapters/collectors/ospf/pom.xml +++ b/features/enlinkd/adapters/collectors/ospf/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.collectors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors.ospf diff --git a/features/enlinkd/adapters/collectors/pom.xml b/features/enlinkd/adapters/collectors/pom.xml index 7b6f917cdb9d..705c320e1aaf 100644 --- a/features/enlinkd/adapters/collectors/pom.xml +++ b/features/enlinkd/adapters/collectors/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.collectors diff --git a/features/enlinkd/adapters/common/pom.xml b/features/enlinkd/adapters/common/pom.xml index dcbddecfc6e2..c98084c64a19 100644 --- a/features/enlinkd/adapters/common/pom.xml +++ b/features/enlinkd/adapters/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.common diff --git a/features/enlinkd/adapters/discovers/bridge/pom.xml b/features/enlinkd/adapters/discovers/bridge/pom.xml index 204349eae4f6..5575052a6183 100644 --- a/features/enlinkd/adapters/discovers/bridge/pom.xml +++ b/features/enlinkd/adapters/discovers/bridge/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.discovers - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.discovers.bridge diff --git a/features/enlinkd/adapters/discovers/pom.xml b/features/enlinkd/adapters/discovers/pom.xml index ff35e75d441d..0473cfc73565 100644 --- a/features/enlinkd/adapters/discovers/pom.xml +++ b/features/enlinkd/adapters/discovers/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.discovers diff --git a/features/enlinkd/adapters/pom.xml b/features/enlinkd/adapters/pom.xml index a3c79083fee8..3c5919ed690e 100644 --- a/features/enlinkd/adapters/pom.xml +++ b/features/enlinkd/adapters/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/adapters/updaters/bridge/pom.xml b/features/enlinkd/adapters/updaters/bridge/pom.xml index 36e90088288b..7faf4270f319 100644 --- a/features/enlinkd/adapters/updaters/bridge/pom.xml +++ b/features/enlinkd/adapters/updaters/bridge/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.bridge diff --git a/features/enlinkd/adapters/updaters/cdp/pom.xml b/features/enlinkd/adapters/updaters/cdp/pom.xml index 0f64196256fd..cdd768903a00 100644 --- a/features/enlinkd/adapters/updaters/cdp/pom.xml +++ b/features/enlinkd/adapters/updaters/cdp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.cdp diff --git a/features/enlinkd/adapters/updaters/isis/pom.xml b/features/enlinkd/adapters/updaters/isis/pom.xml index dc9ada543306..1fb52ea5ad73 100644 --- a/features/enlinkd/adapters/updaters/isis/pom.xml +++ b/features/enlinkd/adapters/updaters/isis/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.isis diff --git a/features/enlinkd/adapters/updaters/lldp/pom.xml b/features/enlinkd/adapters/updaters/lldp/pom.xml index 014c0ed6c6ff..53fdb7b30974 100644 --- a/features/enlinkd/adapters/updaters/lldp/pom.xml +++ b/features/enlinkd/adapters/updaters/lldp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.lldp diff --git a/features/enlinkd/adapters/updaters/nodes/pom.xml b/features/enlinkd/adapters/updaters/nodes/pom.xml index e943e93d2cde..5759b47fd60e 100644 --- a/features/enlinkd/adapters/updaters/nodes/pom.xml +++ b/features/enlinkd/adapters/updaters/nodes/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.nodes diff --git a/features/enlinkd/adapters/updaters/ospf/pom.xml b/features/enlinkd/adapters/updaters/ospf/pom.xml index 41291931f8e2..558cf737c1fd 100644 --- a/features/enlinkd/adapters/updaters/ospf/pom.xml +++ b/features/enlinkd/adapters/updaters/ospf/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters.updaters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters.ospf diff --git a/features/enlinkd/adapters/updaters/pom.xml b/features/enlinkd/adapters/updaters/pom.xml index 1a326927130f..53c999ef2ac2 100644 --- a/features/enlinkd/adapters/updaters/pom.xml +++ b/features/enlinkd/adapters/updaters/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.adapters - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.adapters.updaters diff --git a/features/enlinkd/api/pom.xml b/features/enlinkd/api/pom.xml index 5837f006715c..fa1c66a4f46e 100644 --- a/features/enlinkd/api/pom.xml +++ b/features/enlinkd/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.enlinkd org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/config/pom.xml b/features/enlinkd/config/pom.xml index 5d77d48c8905..da94e7edd16d 100644 --- a/features/enlinkd/config/pom.xml +++ b/features/enlinkd/config/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/daemon/pom.xml b/features/enlinkd/daemon/pom.xml index 9e854ed3b456..8d39c5a34308 100644 --- a/features/enlinkd/daemon/pom.xml +++ b/features/enlinkd/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/generator/pom.xml b/features/enlinkd/generator/pom.xml index da5198248d27..e2e4604cb518 100644 --- a/features/enlinkd/generator/pom.xml +++ b/features/enlinkd/generator/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.enlinkd.generator diff --git a/features/enlinkd/persistence/api/pom.xml b/features/enlinkd/persistence/api/pom.xml index c8ae6658bc07..2b38600d1e1d 100644 --- a/features/enlinkd/persistence/api/pom.xml +++ b/features/enlinkd/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.persistence.api diff --git a/features/enlinkd/persistence/impl/pom.xml b/features/enlinkd/persistence/impl/pom.xml index a9f9b6628226..6594c1687124 100644 --- a/features/enlinkd/persistence/impl/pom.xml +++ b/features/enlinkd/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.persistence.impl diff --git a/features/enlinkd/persistence/pom.xml b/features/enlinkd/persistence/pom.xml index 55c968b6ef57..4743e2eae27a 100644 --- a/features/enlinkd/persistence/pom.xml +++ b/features/enlinkd/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/pom.xml b/features/enlinkd/pom.xml index b3cf92db6b95..573a63b1ca5d 100644 --- a/features/enlinkd/pom.xml +++ b/features/enlinkd/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/enlinkd/service/api/pom.xml b/features/enlinkd/service/api/pom.xml index 5a5ba492845b..375201d56254 100644 --- a/features/enlinkd/service/api/pom.xml +++ b/features/enlinkd/service/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.service.api diff --git a/features/enlinkd/service/impl/pom.xml b/features/enlinkd/service/impl/pom.xml index bfcc86a6bd4b..b4158f53bccf 100644 --- a/features/enlinkd/service/impl/pom.xml +++ b/features/enlinkd/service/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.enlinkd org.opennms.features.enlinkd.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd.service.impl diff --git a/features/enlinkd/service/pom.xml b/features/enlinkd/service/pom.xml index d1266540a9fd..18cfde6d14fd 100644 --- a/features/enlinkd/service/pom.xml +++ b/features/enlinkd/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/enlinkd/shell/pom.xml b/features/enlinkd/shell/pom.xml index 2cb7e8a15bd4..18e244cc8f8d 100644 --- a/features/enlinkd/shell/pom.xml +++ b/features/enlinkd/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.enlinkd.shell diff --git a/features/enlinkd/tests/pom.xml b/features/enlinkd/tests/pom.xml index fae8d2661bd3..fb8d2fcb6aa5 100644 --- a/features/enlinkd/tests/pom.xml +++ b/features/enlinkd/tests/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.enlinkd - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.enlinkd diff --git a/features/events/api/pom.xml b/features/events/api/pom.xml index 21db50a9e4bc..69557dd59038 100644 --- a/features/events/api/pom.xml +++ b/features/events/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/collector/pom.xml b/features/events/collector/pom.xml index a8a1cbc1641b..bf7f9ec9b36a 100644 --- a/features/events/collector/pom.xml +++ b/features/events/collector/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.events org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/daemon/pom.xml b/features/events/daemon/pom.xml index a96dec4a6155..d98029e63005 100644 --- a/features/events/daemon/pom.xml +++ b/features/events/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/pom.xml b/features/events/pom.xml index b9e511640435..6eabcaf09094 100644 --- a/features/events/pom.xml +++ b/features/events/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/events/shell-commands/pom.xml b/features/events/shell-commands/pom.xml index 08a3d19e4930..78b6c0d9752a 100644 --- a/features/events/shell-commands/pom.xml +++ b/features/events/shell-commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/sink/dispatcher/pom.xml b/features/events/sink/dispatcher/pom.xml index e85e2c3a3b5d..b6ef5afc1b27 100644 --- a/features/events/sink/dispatcher/pom.xml +++ b/features/events/sink/dispatcher/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.events.sink org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/events/sink/pom.xml b/features/events/sink/pom.xml index dbaf37d4b19f..1017337d6671 100644 --- a/features/events/sink/pom.xml +++ b/features/events/sink/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.events org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/sink/shell-commands/pom.xml b/features/events/sink/shell-commands/pom.xml index 18020ced4666..f2841ef04f46 100644 --- a/features/events/sink/shell-commands/pom.xml +++ b/features/events/sink/shell-commands/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.events.sink org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/events/syslog/pom.xml b/features/events/syslog/pom.xml index 504cf7f259d3..c393b330cac7 100644 --- a/features/events/syslog/pom.xml +++ b/features/events/syslog/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/traps/pom.xml b/features/events/traps/pom.xml index 4ada0c1f1aac..e27491ab1daa 100644 --- a/features/events/traps/pom.xml +++ b/features/events/traps/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/executor-factory/cassandra/pom.xml b/features/executor-factory/cassandra/pom.xml index 21071b57f3c8..32b2fbaf81ec 100644 --- a/features/executor-factory/cassandra/pom.xml +++ b/features/executor-factory/cassandra/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.executor-factory - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.executor-factory diff --git a/features/executor-factory/pom.xml b/features/executor-factory/pom.xml index 6191dffa5b3b..56fb12920e27 100644 --- a/features/executor-factory/pom.xml +++ b/features/executor-factory/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/flows/api/pom.xml b/features/flows/api/pom.xml index 620b95bb6b8a..58d36600b91a 100644 --- a/features/flows/api/pom.xml +++ b/features/flows/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/classification/engine/api/pom.xml b/features/flows/classification/engine/api/pom.xml index 8dfaa03d85b4..ab181c3c2cbe 100644 --- a/features/flows/classification/engine/api/pom.xml +++ b/features/flows/classification/engine/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.engine - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.engine diff --git a/features/flows/classification/engine/impl/pom.xml b/features/flows/classification/engine/impl/pom.xml index 665877fba5a9..85fc8729c47d 100644 --- a/features/flows/classification/engine/impl/pom.xml +++ b/features/flows/classification/engine/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.engine - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.engine diff --git a/features/flows/classification/engine/pom.xml b/features/flows/classification/engine/pom.xml index 190ed40aac5f..0c613092d3b1 100644 --- a/features/flows/classification/engine/pom.xml +++ b/features/flows/classification/engine/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.classification - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification diff --git a/features/flows/classification/persistence/api/pom.xml b/features/flows/classification/persistence/api/pom.xml index c7ad52641037..8663c16b47be 100644 --- a/features/flows/classification/persistence/api/pom.xml +++ b/features/flows/classification/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.persistence diff --git a/features/flows/classification/persistence/impl/pom.xml b/features/flows/classification/persistence/impl/pom.xml index eec911c6b206..d9558b9a2f60 100644 --- a/features/flows/classification/persistence/impl/pom.xml +++ b/features/flows/classification/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.persistence - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.persistence diff --git a/features/flows/classification/persistence/pom.xml b/features/flows/classification/persistence/pom.xml index c191c279ba1a..06fd0afbe033 100644 --- a/features/flows/classification/persistence/pom.xml +++ b/features/flows/classification/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.classification - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification diff --git a/features/flows/classification/pom.xml b/features/flows/classification/pom.xml index e6ef45d3c36a..aaeb3b636c43 100644 --- a/features/flows/classification/pom.xml +++ b/features/flows/classification/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/classification/shell/pom.xml b/features/flows/classification/shell/pom.xml index c18736b36bea..8187277d00a5 100644 --- a/features/flows/classification/shell/pom.xml +++ b/features/flows/classification/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.flows org.opennms.features.flows.classification - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.classification diff --git a/features/flows/elastic/pom.xml b/features/flows/elastic/pom.xml index 112804de509b..ee5dce853a2d 100644 --- a/features/flows/elastic/pom.xml +++ b/features/flows/elastic/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/itests/pom.xml b/features/flows/itests/pom.xml index 4b91b6948d34..4d6d5105347b 100644 --- a/features/flows/itests/pom.xml +++ b/features/flows/itests/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/kafka-persistence/pom.xml b/features/flows/kafka-persistence/pom.xml index 7d9efaf090f0..f0e7564ec803 100644 --- a/features/flows/kafka-persistence/pom.xml +++ b/features/flows/kafka-persistence/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.flows org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 bundle diff --git a/features/flows/pom.xml b/features/flows/pom.xml index 94626b29f7ea..b41cad78a99d 100644 --- a/features/flows/pom.xml +++ b/features/flows/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/flows/processing/pom.xml b/features/flows/processing/pom.xml index 17c7f5f908df..876cd8eb84ef 100644 --- a/features/flows/processing/pom.xml +++ b/features/flows/processing/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/rest/api/pom.xml b/features/flows/rest/api/pom.xml index 47c684e67c8e..3bac65923d45 100644 --- a/features/flows/rest/api/pom.xml +++ b/features/flows/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.rest diff --git a/features/flows/rest/impl/pom.xml b/features/flows/rest/impl/pom.xml index 9b78315a8709..3946b551c19f 100644 --- a/features/flows/rest/impl/pom.xml +++ b/features/flows/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows.rest diff --git a/features/flows/rest/pom.xml b/features/flows/rest/pom.xml index 6ddcdae1fdb9..ac7e8d51da7e 100644 --- a/features/flows/rest/pom.xml +++ b/features/flows/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/geocoder/api/pom.xml b/features/geocoder/api/pom.xml index 87fa262e28db..02e6747c65b9 100644 --- a/features/geocoder/api/pom.xml +++ b/features/geocoder/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/google/pom.xml b/features/geocoder/google/pom.xml index 42cf8b95eb17..bee68c9ee1b3 100644 --- a/features/geocoder/google/pom.xml +++ b/features/geocoder/google/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/mapquest/pom.xml b/features/geocoder/mapquest/pom.xml index 64d2a9b09373..01fa57c9cbe4 100644 --- a/features/geocoder/mapquest/pom.xml +++ b/features/geocoder/mapquest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/nominatim/pom.xml b/features/geocoder/nominatim/pom.xml index a4a49f4eff53..e3ebfa6d8d87 100644 --- a/features/geocoder/nominatim/pom.xml +++ b/features/geocoder/nominatim/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/pom.xml b/features/geocoder/pom.xml index 44e6824d27af..bd822c09cd2e 100644 --- a/features/geocoder/pom.xml +++ b/features/geocoder/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/geocoder/rest/pom.xml b/features/geocoder/rest/pom.xml index 17207a3fe4ff..357f56e47f52 100644 --- a/features/geocoder/rest/pom.xml +++ b/features/geocoder/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/service/pom.xml b/features/geocoder/service/pom.xml index a8e49617aa24..43cb07889ad8 100644 --- a/features/geocoder/service/pom.xml +++ b/features/geocoder/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geolocation/api/pom.xml b/features/geolocation/api/pom.xml index d8995b8e919c..db5e785193f8 100644 --- a/features/geolocation/api/pom.xml +++ b/features/geolocation/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/geolocation/pom.xml b/features/geolocation/pom.xml index d9a1d2f3c4a1..b95d07b16f02 100644 --- a/features/geolocation/pom.xml +++ b/features/geolocation/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/geolocation/rest/pom.xml b/features/geolocation/rest/pom.xml index 211835fb3de4..5920306f80e6 100644 --- a/features/geolocation/rest/pom.xml +++ b/features/geolocation/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/geolocation/service/pom.xml b/features/geolocation/service/pom.xml index 4c59b2bd191e..0e1503f618f9 100644 --- a/features/geolocation/service/pom.xml +++ b/features/geolocation/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/graph/api/pom.xml b/features/graph/api/pom.xml index 9f221ceb166e..4be2a4b2bf34 100644 --- a/features/graph/api/pom.xml +++ b/features/graph/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/dao/api/pom.xml b/features/graph/dao/api/pom.xml index fc0369fabb42..c3eb41e8460b 100644 --- a/features/graph/dao/api/pom.xml +++ b/features/graph/dao/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.dao diff --git a/features/graph/dao/impl/pom.xml b/features/graph/dao/impl/pom.xml index 78e4b9e0981b..c097f840cf41 100644 --- a/features/graph/dao/impl/pom.xml +++ b/features/graph/dao/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.dao - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.dao diff --git a/features/graph/dao/pom.xml b/features/graph/dao/pom.xml index 86723b5ceee7..628eb90d6607 100644 --- a/features/graph/dao/pom.xml +++ b/features/graph/dao/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/domain/pom.xml b/features/graph/domain/pom.xml index f37de1124a0f..43c18decc831 100644 --- a/features/graph/domain/pom.xml +++ b/features/graph/domain/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/jung/pom.xml b/features/graph/jung/pom.xml index 7450de4fab17..8370ebee6f4e 100644 --- a/features/graph/jung/pom.xml +++ b/features/graph/jung/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/graph/pom.xml b/features/graph/pom.xml index 33f593b94bdf..3b037983e146 100644 --- a/features/graph/pom.xml +++ b/features/graph/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/graph/provider/application/pom.xml b/features/graph/provider/application/pom.xml index d2ebea1a2235..fcbc713877e4 100644 --- a/features/graph/provider/application/pom.xml +++ b/features/graph/provider/application/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/provider/bsm/pom.xml b/features/graph/provider/bsm/pom.xml index 7602ef6d246f..f9c6d5e91fae 100644 --- a/features/graph/provider/bsm/pom.xml +++ b/features/graph/provider/bsm/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/provider/graphml/pom.xml b/features/graph/provider/graphml/pom.xml index 2d73f265a864..4e45fb5c969d 100644 --- a/features/graph/provider/graphml/pom.xml +++ b/features/graph/provider/graphml/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/provider/legacy/pom.xml b/features/graph/provider/legacy/pom.xml index 965d0fed76f6..d04e908b7e6a 100644 --- a/features/graph/provider/legacy/pom.xml +++ b/features/graph/provider/legacy/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/provider/persistence-test/pom.xml b/features/graph/provider/persistence-test/pom.xml index 7d8f16badcf3..afc9f1a61ccf 100644 --- a/features/graph/provider/persistence-test/pom.xml +++ b/features/graph/provider/persistence-test/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/provider/pom.xml b/features/graph/provider/pom.xml index 077790005cf1..39ff1a747f0a 100644 --- a/features/graph/provider/pom.xml +++ b/features/graph/provider/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/provider/topology/pom.xml b/features/graph/provider/topology/pom.xml index 0984ad26257d..271bf7b4de43 100644 --- a/features/graph/provider/topology/pom.xml +++ b/features/graph/provider/topology/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.provider - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.provider diff --git a/features/graph/rest/api/pom.xml b/features/graph/rest/api/pom.xml index 5c974bd45ad9..c0a549202b06 100644 --- a/features/graph/rest/api/pom.xml +++ b/features/graph/rest/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.rest diff --git a/features/graph/rest/impl/pom.xml b/features/graph/rest/impl/pom.xml index 2ea9d9e799cb..8d82c9a3019c 100644 --- a/features/graph/rest/impl/pom.xml +++ b/features/graph/rest/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.graph org.opennms.features.graph.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph.rest diff --git a/features/graph/rest/pom.xml b/features/graph/rest/pom.xml index e33ebe8d9714..8ee30870794f 100644 --- a/features/graph/rest/pom.xml +++ b/features/graph/rest/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/service/pom.xml b/features/graph/service/pom.xml index 90fa0d44ce3d..de599c946d98 100644 --- a/features/graph/service/pom.xml +++ b/features/graph/service/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graph/shell/pom.xml b/features/graph/shell/pom.xml index a89799f312b1..424d812b2ad7 100644 --- a/features/graph/shell/pom.xml +++ b/features/graph/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.graph - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graph diff --git a/features/graphml/api/pom.xml b/features/graphml/api/pom.xml index e9c9c417b377..a29d660c2402 100644 --- a/features/graphml/api/pom.xml +++ b/features/graphml/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.graphml - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graphml diff --git a/features/graphml/pom.xml b/features/graphml/pom.xml index 6c1dd4f41e7d..52facf302af1 100644 --- a/features/graphml/pom.xml +++ b/features/graphml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/graphml/rest/pom.xml b/features/graphml/rest/pom.xml index 8c63db999af1..8f2c69c4fbc3 100644 --- a/features/graphml/rest/pom.xml +++ b/features/graphml/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.graphml - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graphml diff --git a/features/graphml/service/pom.xml b/features/graphml/service/pom.xml index 808ef64cafe7..347b6e014697 100644 --- a/features/graphml/service/pom.xml +++ b/features/graphml/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.graphml - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.graphml diff --git a/features/ifttt/pom.xml b/features/ifttt/pom.xml index 2098dc66df00..4acf49c23663 100644 --- a/features/ifttt/pom.xml +++ b/features/ifttt/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/inmemory-timeseries-plugin/pom.xml b/features/inmemory-timeseries-plugin/pom.xml index 5e083362653c..e1a386c4c41f 100644 --- a/features/inmemory-timeseries-plugin/pom.xml +++ b/features/inmemory-timeseries-plugin/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features inmemory-timeseries-plugin diff --git a/features/instrumentationLogReader/pom.xml b/features/instrumentationLogReader/pom.xml index 4f4cd5d8f6de..3d8571729577 100644 --- a/features/instrumentationLogReader/pom.xml +++ b/features/instrumentationLogReader/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features org.opennms.features.instrumentationLogReader diff --git a/features/jdbc-collector/pom.xml b/features/jdbc-collector/pom.xml index a86918da1e70..21daf3db0819 100644 --- a/features/jdbc-collector/pom.xml +++ b/features/jdbc-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/jest/client/pom.xml b/features/jest/client/pom.xml index def89784b820..709ef6f61466 100644 --- a/features/jest/client/pom.xml +++ b/features/jest/client/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.jest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.jest diff --git a/features/jest/dependencies/pom.xml b/features/jest/dependencies/pom.xml index 35da4ff69c5d..1697a2937f5b 100644 --- a/features/jest/dependencies/pom.xml +++ b/features/jest/dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.jest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.jest diff --git a/features/jest/feature/pom.xml b/features/jest/feature/pom.xml index f7c420a67c0d..231c1649f3f8 100644 --- a/features/jest/feature/pom.xml +++ b/features/jest/feature/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.jest - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.jest opennms-jest diff --git a/features/jest/jest-complete-osgi/pom.xml b/features/jest/jest-complete-osgi/pom.xml index 9d39a2a28866..96fa5d3a8cc3 100644 --- a/features/jest/jest-complete-osgi/pom.xml +++ b/features/jest/jest-complete-osgi/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.jest - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/jest/pom.xml b/features/jest/pom.xml index 3a3a4dcb8f85..c50be574a9b1 100644 --- a/features/jest/pom.xml +++ b/features/jest/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features org.opennms.features.jest diff --git a/features/jmx-config-generator/pom.xml b/features/jmx-config-generator/pom.xml index 969bcd7075b7..04bc0d164469 100644 --- a/features/jmx-config-generator/pom.xml +++ b/features/jmx-config-generator/pom.xml @@ -6,7 +6,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features jmxconfiggenerator diff --git a/features/juniper-tca-collector/pom.xml b/features/juniper-tca-collector/pom.xml index 69d959e56d2e..c5d74b952065 100644 --- a/features/juniper-tca-collector/pom.xml +++ b/features/juniper-tca-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/kafka/consumer/pom.xml b/features/kafka/consumer/pom.xml index bdb3ad5917de..81c1b42abecf 100644 --- a/features/kafka/consumer/pom.xml +++ b/features/kafka/consumer/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.kafka org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.kafka diff --git a/features/kafka/pom.xml b/features/kafka/pom.xml index 176fd1263bea..5697b1d06261 100644 --- a/features/kafka/pom.xml +++ b/features/kafka/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/kafka/producer/pom.xml b/features/kafka/producer/pom.xml index 783c3fcbe617..cfe170522510 100644 --- a/features/kafka/producer/pom.xml +++ b/features/kafka/producer/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.kafka - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/karaf-health/pom.xml b/features/karaf-health/pom.xml index ca378b47b2be..360c68e5aa7a 100644 --- a/features/karaf-health/pom.xml +++ b/features/karaf-health/pom.xml @@ -9,7 +9,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/measurements/api/pom.xml b/features/measurements/api/pom.xml index 812c4da7f655..cfff71288832 100644 --- a/features/measurements/api/pom.xml +++ b/features/measurements/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/measurements/impl/pom.xml b/features/measurements/impl/pom.xml index 7c47d8483047..4fbfa58aef43 100644 --- a/features/measurements/impl/pom.xml +++ b/features/measurements/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/measurements/pom.xml b/features/measurements/pom.xml index db0cfd551ccc..509e8bd0f527 100644 --- a/features/measurements/pom.xml +++ b/features/measurements/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/measurements/rest/pom.xml b/features/measurements/rest/pom.xml index dbb1101052d2..206cd621ef8d 100644 --- a/features/measurements/rest/pom.xml +++ b/features/measurements/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/measurements/shell/pom.xml b/features/measurements/shell/pom.xml index 0fbd16f30cb1..50724f8349f3 100644 --- a/features/measurements/shell/pom.xml +++ b/features/measurements/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/mib-compiler/pom.xml b/features/mib-compiler/pom.xml index f0fa9014ae40..c11ea85ff5b3 100644 --- a/features/mib-compiler/pom.xml +++ b/features/mib-compiler/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/minion/core/features/pom.xml b/features/minion/core/features/pom.xml index 81d6755400a4..2dada0242716 100644 --- a/features/minion/core/features/pom.xml +++ b/features/minion/core/features/pom.xml @@ -8,7 +8,7 @@ org.opennms.features.minion core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/minion/core/health-check/pom.xml b/features/minion/core/health-check/pom.xml index 42cc3aa188f3..99bbc26f25ac 100644 --- a/features/minion/core/health-check/pom.xml +++ b/features/minion/core/health-check/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.minion core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 health-check diff --git a/features/minion/core/impl/pom.xml b/features/minion/core/impl/pom.xml index 9ace477dbf2b..cd34c9873208 100644 --- a/features/minion/core/impl/pom.xml +++ b/features/minion/core/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-impl diff --git a/features/minion/core/pom.xml b/features/minion/core/pom.xml index 7937c415bf9d..689fafd71ba5 100644 --- a/features/minion/core/pom.xml +++ b/features/minion/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-parent diff --git a/features/minion/core/repository/pom.xml b/features/minion/core/repository/pom.xml index b1f106e7300e..d8c5873e4484 100644 --- a/features/minion/core/repository/pom.xml +++ b/features/minion/core/repository/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core-repository diff --git a/features/minion/dominion/grpc-client/pom.xml b/features/minion/dominion/grpc-client/pom.xml index 81040ba17fe5..c6d0f3313ed8 100644 --- a/features/minion/dominion/grpc-client/pom.xml +++ b/features/minion/dominion/grpc-client/pom.xml @@ -5,7 +5,7 @@ dominion org.opennms.features.minion - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 dominion-grpc-client diff --git a/features/minion/dominion/pom.xml b/features/minion/dominion/pom.xml index f9a1700f58d2..6e8246b9ee54 100644 --- a/features/minion/dominion/pom.xml +++ b/features/minion/dominion/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 dominion diff --git a/features/minion/heartbeat/common/pom.xml b/features/minion/heartbeat/common/pom.xml index 965819274eed..6bc2f1b1125f 100644 --- a/features/minion/heartbeat/common/pom.xml +++ b/features/minion/heartbeat/common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/consumer/pom.xml b/features/minion/heartbeat/consumer/pom.xml index bc0ccebc1536..6b9959015ec3 100644 --- a/features/minion/heartbeat/consumer/pom.xml +++ b/features/minion/heartbeat/consumer/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/pom.xml b/features/minion/heartbeat/pom.xml index 88a3550106df..d50d30ae07fd 100644 --- a/features/minion/heartbeat/pom.xml +++ b/features/minion/heartbeat/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/producer/pom.xml b/features/minion/heartbeat/producer/pom.xml index 1a53f732a106..c723d445d525 100644 --- a/features/minion/heartbeat/producer/pom.xml +++ b/features/minion/heartbeat/producer/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/pom.xml b/features/minion/pom.xml index b2999b1e3ecc..3ad466db1633 100644 --- a/features/minion/pom.xml +++ b/features/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion diff --git a/features/minion/repository/pom.xml b/features/minion/repository/pom.xml index d01d842fa26f..1f0584fb7c14 100644 --- a/features/minion/repository/pom.xml +++ b/features/minion/repository/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 repository diff --git a/features/minion/shell/collection/pom.xml b/features/minion/shell/collection/pom.xml index 8707164c3582..e08fbebfbb31 100644 --- a/features/minion/shell/collection/pom.xml +++ b/features/minion/shell/collection/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/minion/shell/poller/pom.xml b/features/minion/shell/poller/pom.xml index c276008e3a42..e6a4a4830e8f 100644 --- a/features/minion/shell/poller/pom.xml +++ b/features/minion/shell/poller/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/minion/shell/pom.xml b/features/minion/shell/pom.xml index 7fbc39a6cdcf..addf10ab4c74 100644 --- a/features/minion/shell/pom.xml +++ b/features/minion/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.shell diff --git a/features/minion/shell/provision/pom.xml b/features/minion/shell/provision/pom.xml index b8bc48d356ea..39cafdec07fb 100644 --- a/features/minion/shell/provision/pom.xml +++ b/features/minion/shell/provision/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/minion/status/pom.xml b/features/minion/status/pom.xml index dc1f0d8d5662..09fe5418bdfa 100644 --- a/features/minion/status/pom.xml +++ b/features/minion/status/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.minion.status diff --git a/features/name-cutter/pom.xml b/features/name-cutter/pom.xml index 7de1f9d0292e..906283dc73d6 100644 --- a/features/name-cutter/pom.xml +++ b/features/name-cutter/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features org.opennms.features.name-cutter diff --git a/features/newts-repository-converter/pom.xml b/features/newts-repository-converter/pom.xml index 7b7900be6e4b..33aa555d0e8c 100644 --- a/features/newts-repository-converter/pom.xml +++ b/features/newts-repository-converter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/newts/pom.xml b/features/newts/pom.xml index 0f30669bb278..3052615176f0 100644 --- a/features/newts/pom.xml +++ b/features/newts/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/notifications/api/pom.xml b/features/notifications/api/pom.xml index cb50f8eb65e8..84236ef7bd37 100644 --- a/features/notifications/api/pom.xml +++ b/features/notifications/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.notifications diff --git a/features/notifications/pom.xml b/features/notifications/pom.xml index 9d49a11b9062..49f448d8cb71 100644 --- a/features/notifications/pom.xml +++ b/features/notifications/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/notifications/shell/pom.xml b/features/notifications/shell/pom.xml index 575e508a852c..3f101750dd01 100644 --- a/features/notifications/shell/pom.xml +++ b/features/notifications/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.notifications diff --git a/features/notifications/ticket-strategy/pom.xml b/features/notifications/ticket-strategy/pom.xml index 1b3b843eed3d..cb1d1c872dea 100644 --- a/features/notifications/ticket-strategy/pom.xml +++ b/features/notifications/ticket-strategy/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.notifications diff --git a/features/nrtg/api/pom.xml b/features/nrtg/api/pom.xml index b0e890e34d29..dd8b8424c4b9 100644 --- a/features/nrtg/api/pom.xml +++ b/features/nrtg/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-api diff --git a/features/nrtg/broker/pom.xml b/features/nrtg/broker/pom.xml index f905988ec48d..1abe84260535 100644 --- a/features/nrtg/broker/pom.xml +++ b/features/nrtg/broker/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-broker diff --git a/features/nrtg/commander/pom.xml b/features/nrtg/commander/pom.xml index 7b5891013cc3..730c5bd34b1d 100644 --- a/features/nrtg/commander/pom.xml +++ b/features/nrtg/commander/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-commander diff --git a/features/nrtg/jar/nrtcollector/pom.xml b/features/nrtg/jar/nrtcollector/pom.xml index 9e93ce4f6192..9e806e88bb59 100644 --- a/features/nrtg/jar/nrtcollector/pom.xml +++ b/features/nrtg/jar/nrtcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg jar - 32.0.2 + 32.0.3-SNAPSHOT nrtg-collector-standalone OpenNMS :: Features :: NRTG :: NRTCollector JAR diff --git a/features/nrtg/jar/pom.xml b/features/nrtg/jar/pom.xml index cb58c9431f8f..598baba82ab2 100644 --- a/features/nrtg/jar/pom.xml +++ b/features/nrtg/jar/pom.xml @@ -3,7 +3,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.nrtg diff --git a/features/nrtg/nrtbroker-jms/pom.xml b/features/nrtg/nrtbroker-jms/pom.xml index b85bdaec69a5..e6fe0ffeb36a 100644 --- a/features/nrtg/nrtbroker-jms/pom.xml +++ b/features/nrtg/nrtbroker-jms/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-nrtbroker-jms diff --git a/features/nrtg/nrtbroker-local/pom.xml b/features/nrtg/nrtbroker-local/pom.xml index e23595842e8b..abe15e2fcf32 100644 --- a/features/nrtg/nrtbroker-local/pom.xml +++ b/features/nrtg/nrtbroker-local/pom.xml @@ -5,7 +5,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-nrtbroker-local diff --git a/features/nrtg/nrtcollector/pom.xml b/features/nrtg/nrtcollector/pom.xml index 318cecf30a6a..87a107bf2244 100644 --- a/features/nrtg/nrtcollector/pom.xml +++ b/features/nrtg/nrtcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-collector diff --git a/features/nrtg/pom.xml b/features/nrtg/pom.xml index 546bbb319128..c3cd3159fea8 100644 --- a/features/nrtg/pom.xml +++ b/features/nrtg/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/nrtg/protocolcollector/pom.xml b/features/nrtg/protocolcollector/pom.xml index 94f486152a86..8a9db1db8702 100644 --- a/features/nrtg/protocolcollector/pom.xml +++ b/features/nrtg/protocolcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg protocol-collectors diff --git a/features/nrtg/protocolcollector/snmp/pom.xml b/features/nrtg/protocolcollector/snmp/pom.xml index af3304d4ade5..e9abf7e85f05 100644 --- a/features/nrtg/protocolcollector/snmp/pom.xml +++ b/features/nrtg/protocolcollector/snmp/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg protocol-collectors - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg.protocolcollector nrtg-protocolcollector-snmp diff --git a/features/nrtg/protocolcollector/tca/pom.xml b/features/nrtg/protocolcollector/tca/pom.xml index 1beae4810903..3f7eb91ed2b7 100644 --- a/features/nrtg/protocolcollector/tca/pom.xml +++ b/features/nrtg/protocolcollector/tca/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg protocol-collectors - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg.protocolcollector nrtg-protocolcollector-tca diff --git a/features/nrtg/system-exports/pom.xml b/features/nrtg/system-exports/pom.xml index ce7ae9e51aee..796c0939dbdc 100644 --- a/features/nrtg/system-exports/pom.xml +++ b/features/nrtg/system-exports/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-system-exports diff --git a/features/nrtg/web/pom.xml b/features/nrtg/web/pom.xml index a2c147c41da2..f55f4838f165 100644 --- a/features/nrtg/web/pom.xml +++ b/features/nrtg/web/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.nrtg nrtg-web diff --git a/features/openconfig/api/pom.xml b/features/openconfig/api/pom.xml index 07c5cd1c06b9..cd3e3bbe5d51 100644 --- a/features/openconfig/api/pom.xml +++ b/features/openconfig/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.openconfig org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/openconfig/common/pom.xml b/features/openconfig/common/pom.xml index 5a4b20821252..acde1cfcd2a8 100644 --- a/features/openconfig/common/pom.xml +++ b/features/openconfig/common/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.openconfig org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/openconfig/pom.xml b/features/openconfig/pom.xml index c8b3d3ffcbd5..6409da4d098b 100644 --- a/features/openconfig/pom.xml +++ b/features/openconfig/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/openconfig/telemetry-client/pom.xml b/features/openconfig/telemetry-client/pom.xml index b976ec86dd40..2c02725be23c 100644 --- a/features/openconfig/telemetry-client/pom.xml +++ b/features/openconfig/telemetry-client/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.openconfig org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/opennms-es-rest/pom.xml b/features/opennms-es-rest/pom.xml index ceda51658c73..850e162c1fcf 100644 --- a/features/opennms-es-rest/pom.xml +++ b/features/opennms-es-rest/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/opennms-osgi-core-rest/pom.xml b/features/opennms-osgi-core-rest/pom.xml index 4e2d068fe988..5b25b0217a41 100644 --- a/features/opennms-osgi-core-rest/pom.xml +++ b/features/opennms-osgi-core-rest/pom.xml @@ -5,7 +5,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.osgi diff --git a/features/opennms-osgi-core/pom.xml b/features/opennms-osgi-core/pom.xml index 8cbe7d889bc8..f34828d24aed 100644 --- a/features/opennms-osgi-core/pom.xml +++ b/features/opennms-osgi-core/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/osgi-jsr223/pom.xml b/features/osgi-jsr223/pom.xml index 84902e4db835..de59f9891834 100644 --- a/features/osgi-jsr223/pom.xml +++ b/features/osgi-jsr223/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/perspectivepoller/pom.xml b/features/perspectivepoller/pom.xml index b8d9a6de1332..3c519ad33198 100644 --- a/features/perspectivepoller/pom.xml +++ b/features/perspectivepoller/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/poller/api/pom.xml b/features/poller/api/pom.xml index cb8402bbd64a..243d9d6d0fa8 100644 --- a/features/poller/api/pom.xml +++ b/features/poller/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/client-rpc/pom.xml b/features/poller/client-rpc/pom.xml index d0f8b5a1a3f2..b300555c8968 100644 --- a/features/poller/client-rpc/pom.xml +++ b/features/poller/client-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/monitors/core/pom.xml b/features/poller/monitors/core/pom.xml index 8e979bdcd60e..e400c596604a 100644 --- a/features/poller/monitors/core/pom.xml +++ b/features/poller/monitors/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.poller org.opennms.features.poller.monitors - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller.monitors diff --git a/features/poller/monitors/pom.xml b/features/poller/monitors/pom.xml index 0ce074e39ac5..852531e5aecc 100644 --- a/features/poller/monitors/pom.xml +++ b/features/poller/monitors/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/pom.xml b/features/poller/pom.xml index 30d188c90fc0..b679af6fb934 100644 --- a/features/poller/pom.xml +++ b/features/poller/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/poller/runtime/pom.xml b/features/poller/runtime/pom.xml index 01ab3d1e0341..edf421246bc5 100644 --- a/features/poller/runtime/pom.xml +++ b/features/poller/runtime/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/shell/pom.xml b/features/poller/shell/pom.xml index 351c0faf5860..d59d9e7c2923 100644 --- a/features/poller/shell/pom.xml +++ b/features/poller/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/pom.xml b/features/pom.xml index f876ad5cfacf..5da5c7eaf342 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/prometheus-collector/pom.xml b/features/prometheus-collector/pom.xml index 3f664ce8e8cb..5af3f4f5e860 100644 --- a/features/prometheus-collector/pom.xml +++ b/features/prometheus-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/provisioning/api/pom.xml b/features/provisioning/api/pom.xml index b81bbc110c2c..dbd207eb6e3b 100644 --- a/features/provisioning/api/pom.xml +++ b/features/provisioning/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.provisioning - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.provisioning diff --git a/features/provisioning/lib/pom.xml b/features/provisioning/lib/pom.xml index 3c76c7554280..776323517ed0 100644 --- a/features/provisioning/lib/pom.xml +++ b/features/provisioning/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.provisioning - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.provisioning diff --git a/features/provisioning/pom.xml b/features/provisioning/pom.xml index 613dfe97ed3a..d3adb1170e21 100644 --- a/features/provisioning/pom.xml +++ b/features/provisioning/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/reporting/api/pom.xml b/features/reporting/api/pom.xml index 35ad43006583..8c9d9cd73211 100644 --- a/features/reporting/api/pom.xml +++ b/features/reporting/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/availability/pom.xml b/features/reporting/availability/pom.xml index 1a06b134562f..3a82d48a3e32 100644 --- a/features/reporting/availability/pom.xml +++ b/features/reporting/availability/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/core/pom.xml b/features/reporting/core/pom.xml index d0b2621f6f7c..39d0fda6ea94 100644 --- a/features/reporting/core/pom.xml +++ b/features/reporting/core/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/dao/pom.xml b/features/reporting/dao/pom.xml index 2f153c6bdda6..7b5dbee6835d 100644 --- a/features/reporting/dao/pom.xml +++ b/features/reporting/dao/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports-compiler/pom.xml b/features/reporting/jasper-reports-compiler/pom.xml index 6f7f27f3ce63..ee07b725ad6b 100644 --- a/features/reporting/jasper-reports-compiler/pom.xml +++ b/features/reporting/jasper-reports-compiler/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports-filter/pom.xml b/features/reporting/jasper-reports-filter/pom.xml index 3454210b090c..9027892670fb 100644 --- a/features/reporting/jasper-reports-filter/pom.xml +++ b/features/reporting/jasper-reports-filter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports/pom.xml b/features/reporting/jasper-reports/pom.xml index bb6f3b275017..69decf3df595 100644 --- a/features/reporting/jasper-reports/pom.xml +++ b/features/reporting/jasper-reports/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/model/pom.xml b/features/reporting/model/pom.xml index 55fa4b8993c0..761bbc53e558 100644 --- a/features/reporting/model/pom.xml +++ b/features/reporting/model/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/pom.xml b/features/reporting/pom.xml index cd92a8ac9aef..c127f0dfddb2 100644 --- a/features/reporting/pom.xml +++ b/features/reporting/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/reporting/repository/pom.xml b/features/reporting/repository/pom.xml index c243301658b8..f0ba5a2a8f01 100644 --- a/features/reporting/repository/pom.xml +++ b/features/reporting/repository/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/rest/pom.xml b/features/reporting/rest/pom.xml index d1f61e70d168..26a230dac6ab 100644 --- a/features/reporting/rest/pom.xml +++ b/features/reporting/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/sdo/pom.xml b/features/reporting/sdo/pom.xml index e7c6d2fe4dc8..dd2584a0d58c 100644 --- a/features/reporting/sdo/pom.xml +++ b/features/reporting/sdo/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/request-tracker/pom.xml b/features/request-tracker/pom.xml index 6ccd9a1de9c1..325a37a8004d 100644 --- a/features/request-tracker/pom.xml +++ b/features/request-tracker/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/rest-provider/pom.xml b/features/rest-provider/pom.xml index c802ad5dd846..8380d98598bf 100644 --- a/features/rest-provider/pom.xml +++ b/features/rest-provider/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/rest/common/pom.xml b/features/rest/common/pom.xml index c027e08989a1..26674f6b7877 100644 --- a/features/rest/common/pom.xml +++ b/features/rest/common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/mapper/pom.xml b/features/rest/mapper/pom.xml index b424ed8fe010..0f8c078a92eb 100644 --- a/features/rest/mapper/pom.xml +++ b/features/rest/mapper/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/model/pom.xml b/features/rest/model/pom.xml index 6ce81b1bc3fd..7bcecbffdbd6 100644 --- a/features/rest/model/pom.xml +++ b/features/rest/model/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/pom.xml b/features/rest/pom.xml index 5240c04dca2e..0330554795af 100644 --- a/features/rest/pom.xml +++ b/features/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/root-webapp/pom.xml b/features/root-webapp/pom.xml index 6f981c080a33..9e460d97596c 100644 --- a/features/root-webapp/pom.xml +++ b/features/root-webapp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/scv/api/pom.xml b/features/scv/api/pom.xml index ccd2c66e8047..fc914f6f7143 100644 --- a/features/scv/api/pom.xml +++ b/features/scv/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/dominion-grpc-impl/pom.xml b/features/scv/dominion-grpc-impl/pom.xml index 35da11d31e72..5552774f7f6b 100644 --- a/features/scv/dominion-grpc-impl/pom.xml +++ b/features/scv/dominion-grpc-impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/jceks-impl/pom.xml b/features/scv/jceks-impl/pom.xml index fc9978856855..a5e63586c8f9 100644 --- a/features/scv/jceks-impl/pom.xml +++ b/features/scv/jceks-impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/pom.xml b/features/scv/pom.xml index 97789d2fd1f7..41d361757d8e 100644 --- a/features/scv/pom.xml +++ b/features/scv/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/scv/rest/pom.xml b/features/scv/rest/pom.xml index cb621ce80348..ce3be02d558e 100644 --- a/features/scv/rest/pom.xml +++ b/features/scv/rest/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/scv/scvcli/pom.xml b/features/scv/scvcli/pom.xml index 78934e1bd97d..df129a07f785 100644 --- a/features/scv/scvcli/pom.xml +++ b/features/scv/scvcli/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/shell/pom.xml b/features/scv/shell/pom.xml index ed1ee76b8de8..84d72bd10b3a 100644 --- a/features/scv/shell/pom.xml +++ b/features/scv/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/search/api/pom.xml b/features/search/api/pom.xml index 261e452e6f99..5fb0ab61eddf 100644 --- a/features/search/api/pom.xml +++ b/features/search/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.search - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.search diff --git a/features/search/pom.xml b/features/search/pom.xml index 112a7cfd1cba..8c22030d1b9b 100644 --- a/features/search/pom.xml +++ b/features/search/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/search/providers/pom.xml b/features/search/providers/pom.xml index b1c64b9cb160..98c0f96563ba 100644 --- a/features/search/providers/pom.xml +++ b/features/search/providers/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.search - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.search diff --git a/features/search/rest/pom.xml b/features/search/rest/pom.xml index 503591c37eeb..3ddca02fc94a 100644 --- a/features/search/rest/pom.xml +++ b/features/search/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.search - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.search diff --git a/features/search/service/pom.xml b/features/search/service/pom.xml index 9409e08df9cb..49472218c575 100644 --- a/features/search/service/pom.xml +++ b/features/search/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.search - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.search diff --git a/features/sentinel/core/pom.xml b/features/sentinel/core/pom.xml index fb6ca7d09871..07acdd9f4ec1 100644 --- a/features/sentinel/core/pom.xml +++ b/features/sentinel/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.sentinel sentinel-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 core diff --git a/features/sentinel/pom.xml b/features/sentinel/pom.xml index 91fb4b0df461..bb81e5a036c5 100644 --- a/features/sentinel/pom.xml +++ b/features/sentinel/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.sentinel diff --git a/features/sentinel/repository/pom.xml b/features/sentinel/repository/pom.xml index 27583bf62438..e19834a8e3b8 100644 --- a/features/sentinel/repository/pom.xml +++ b/features/sentinel/repository/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.sentinel sentinel-parent - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 repository diff --git a/features/situation-feedback/api/pom.xml b/features/situation-feedback/api/pom.xml index 5aef9554b0c1..9fe6a041b11e 100644 --- a/features/situation-feedback/api/pom.xml +++ b/features/situation-feedback/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.situation-feedback - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.situation-feedback diff --git a/features/situation-feedback/elastic/pom.xml b/features/situation-feedback/elastic/pom.xml index 10b1f1c6129a..63dced5acc23 100644 --- a/features/situation-feedback/elastic/pom.xml +++ b/features/situation-feedback/elastic/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.situation-feedback - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.situation-feedback diff --git a/features/situation-feedback/pom.xml b/features/situation-feedback/pom.xml index b6d47e383696..42154329fe59 100644 --- a/features/situation-feedback/pom.xml +++ b/features/situation-feedback/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/situation-feedback/rest/api/pom.xml b/features/situation-feedback/rest/api/pom.xml index 76c1cd1621a9..2cbb25b7b15b 100644 --- a/features/situation-feedback/rest/api/pom.xml +++ b/features/situation-feedback/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.situation-feedback org.opennms.features.situation-feedback.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.situation-feedback.rest diff --git a/features/situation-feedback/rest/impl/pom.xml b/features/situation-feedback/rest/impl/pom.xml index 648e8b92bc0a..90b31b5d876d 100644 --- a/features/situation-feedback/rest/impl/pom.xml +++ b/features/situation-feedback/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.situation-feedback org.opennms.features.situation-feedback.rest - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.situation-feedback.rest diff --git a/features/situation-feedback/rest/pom.xml b/features/situation-feedback/rest/pom.xml index 9b6e369bf6ae..093167ca8e7b 100644 --- a/features/situation-feedback/rest/pom.xml +++ b/features/situation-feedback/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.situation-feedback - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.situation-feedback diff --git a/features/springframework-security/pom.xml b/features/springframework-security/pom.xml index e99d42e75863..474492b5e7d7 100644 --- a/features/springframework-security/pom.xml +++ b/features/springframework-security/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/status/api/pom.xml b/features/status/api/pom.xml index a3dea5257b5f..27837839c88e 100644 --- a/features/status/api/pom.xml +++ b/features/status/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.status - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.status diff --git a/features/status/pom.xml b/features/status/pom.xml index 9799b0b384c0..726b396b730a 100644 --- a/features/status/pom.xml +++ b/features/status/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/status/rest/pom.xml b/features/status/rest/pom.xml index 0701e6b61d7e..3ad464340977 100644 --- a/features/status/rest/pom.xml +++ b/features/status/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.status - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.status diff --git a/features/system-report/pom.xml b/features/system-report/pom.xml index aea4faee20b4..5eacbc59e1ad 100644 --- a/features/system-report/pom.xml +++ b/features/system-report/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features org.opennms.features.system-report diff --git a/features/telemetry/api/pom.xml b/features/telemetry/api/pom.xml index 5944d195010e..00a2f38888ff 100644 --- a/features/telemetry/api/pom.xml +++ b/features/telemetry/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/common/pom.xml b/features/telemetry/common/pom.xml index 4893fd49b76d..162e4019f68e 100644 --- a/features/telemetry/common/pom.xml +++ b/features/telemetry/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/config/api/pom.xml b/features/telemetry/config/api/pom.xml index e5fb9152699e..e94649698ebc 100644 --- a/features/telemetry/config/api/pom.xml +++ b/features/telemetry/config/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.config diff --git a/features/telemetry/config/jaxb/pom.xml b/features/telemetry/config/jaxb/pom.xml index ac14164d02e8..2b888c9e7d2e 100644 --- a/features/telemetry/config/jaxb/pom.xml +++ b/features/telemetry/config/jaxb/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.config - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.config diff --git a/features/telemetry/config/pom.xml b/features/telemetry/config/pom.xml index bd5d7f3a3745..f50c51538ff3 100644 --- a/features/telemetry/config/pom.xml +++ b/features/telemetry/config/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/daemon/pom.xml b/features/telemetry/daemon/pom.xml index d3c164f1091f..b661f72ea27b 100644 --- a/features/telemetry/daemon/pom.xml +++ b/features/telemetry/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/distributed/common/pom.xml b/features/telemetry/distributed/common/pom.xml index 9df12868b1f3..390dab3c24f5 100644 --- a/features/telemetry/distributed/common/pom.xml +++ b/features/telemetry/distributed/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.distributed diff --git a/features/telemetry/distributed/minion/pom.xml b/features/telemetry/distributed/minion/pom.xml index d5b64cc8ab05..4851f3582b98 100644 --- a/features/telemetry/distributed/minion/pom.xml +++ b/features/telemetry/distributed/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.distributed diff --git a/features/telemetry/distributed/pom.xml b/features/telemetry/distributed/pom.xml index 206cbceb9c45..aac24229e8ae 100644 --- a/features/telemetry/distributed/pom.xml +++ b/features/telemetry/distributed/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/distributed/sentinel/pom.xml b/features/telemetry/distributed/sentinel/pom.xml index 5967fa70b82d..9373b6f7023a 100644 --- a/features/telemetry/distributed/sentinel/pom.xml +++ b/features/telemetry/distributed/sentinel/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.distributed - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.distributed diff --git a/features/telemetry/itests/pom.xml b/features/telemetry/itests/pom.xml index 617b1b6dad0e..ccd96ebbb354 100644 --- a/features/telemetry/itests/pom.xml +++ b/features/telemetry/itests/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/listeners/pom.xml b/features/telemetry/listeners/pom.xml index 48a714131c9f..18ff841d5bd7 100644 --- a/features/telemetry/listeners/pom.xml +++ b/features/telemetry/listeners/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/pom.xml b/features/telemetry/pom.xml index bcb7dbe29044..c224af39fe70 100644 --- a/features/telemetry/pom.xml +++ b/features/telemetry/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/telemetry/protocols/adapters/pom.xml b/features/telemetry/protocols/adapters/pom.xml index 283c05e7ec80..b74f1027332c 100644 --- a/features/telemetry/protocols/adapters/pom.xml +++ b/features/telemetry/protocols/adapters/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/bmp/adapter/pom.xml b/features/telemetry/protocols/bmp/adapter/pom.xml index b2448e0a352e..448b0ff100bf 100644 --- a/features/telemetry/protocols/bmp/adapter/pom.xml +++ b/features/telemetry/protocols/bmp/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.bmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.bmp diff --git a/features/telemetry/protocols/bmp/parser/pom.xml b/features/telemetry/protocols/bmp/parser/pom.xml index 430f96505e37..0abd04277830 100644 --- a/features/telemetry/protocols/bmp/parser/pom.xml +++ b/features/telemetry/protocols/bmp/parser/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.bmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.bmp diff --git a/features/telemetry/protocols/bmp/persistence/api/pom.xml b/features/telemetry/protocols/bmp/persistence/api/pom.xml index b8783e6ddea8..585cec400fa5 100644 --- a/features/telemetry/protocols/bmp/persistence/api/pom.xml +++ b/features/telemetry/protocols/bmp/persistence/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.bmp.persistence org.opennms.features.telemetry.protocols.bmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/bmp/persistence/impl/pom.xml b/features/telemetry/protocols/bmp/persistence/impl/pom.xml index 983eab55810f..3a84960b52e5 100644 --- a/features/telemetry/protocols/bmp/persistence/impl/pom.xml +++ b/features/telemetry/protocols/bmp/persistence/impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.bmp.persistence org.opennms.features.telemetry.protocols.bmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/bmp/persistence/pom.xml b/features/telemetry/protocols/bmp/persistence/pom.xml index 0f94f42bdfbf..29772947d119 100644 --- a/features/telemetry/protocols/bmp/persistence/pom.xml +++ b/features/telemetry/protocols/bmp/persistence/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.bmp org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/bmp/pom.xml b/features/telemetry/protocols/bmp/pom.xml index a7b7b737adb4..3c5e9cf8357d 100644 --- a/features/telemetry/protocols/bmp/pom.xml +++ b/features/telemetry/protocols/bmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/bmp/stats/pom.xml b/features/telemetry/protocols/bmp/stats/pom.xml index 200ace26028b..75efb39d6d65 100644 --- a/features/telemetry/protocols/bmp/stats/pom.xml +++ b/features/telemetry/protocols/bmp/stats/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.bmp org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/bmp/transport/pom.xml b/features/telemetry/protocols/bmp/transport/pom.xml index 1bc345e0ad04..f012db811be6 100644 --- a/features/telemetry/protocols/bmp/transport/pom.xml +++ b/features/telemetry/protocols/bmp/transport/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.bmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.bmp diff --git a/features/telemetry/protocols/common/pom.xml b/features/telemetry/protocols/common/pom.xml index 6a3e1d5f4b20..00ab90212126 100644 --- a/features/telemetry/protocols/common/pom.xml +++ b/features/telemetry/protocols/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/flows/pom.xml b/features/telemetry/protocols/flows/pom.xml index 5911d2baa938..a5d101c9383b 100644 --- a/features/telemetry/protocols/flows/pom.xml +++ b/features/telemetry/protocols/flows/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/graphite/adapter/pom.xml b/features/telemetry/protocols/graphite/adapter/pom.xml index d35217d88cd8..b67381a74da3 100644 --- a/features/telemetry/protocols/graphite/adapter/pom.xml +++ b/features/telemetry/protocols/graphite/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.graphite - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.graphite diff --git a/features/telemetry/protocols/graphite/pom.xml b/features/telemetry/protocols/graphite/pom.xml index c5a53e213711..ca0e6d5d4c05 100644 --- a/features/telemetry/protocols/graphite/pom.xml +++ b/features/telemetry/protocols/graphite/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/jti/adapter/pom.xml b/features/telemetry/protocols/jti/adapter/pom.xml index 44cd521a064e..933ec386b2c8 100644 --- a/features/telemetry/protocols/jti/adapter/pom.xml +++ b/features/telemetry/protocols/jti/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.jti - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.jti diff --git a/features/telemetry/protocols/jti/pom.xml b/features/telemetry/protocols/jti/pom.xml index c14406916f64..d642c74aff61 100644 --- a/features/telemetry/protocols/jti/pom.xml +++ b/features/telemetry/protocols/jti/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/netflow/adapter/pom.xml b/features/telemetry/protocols/netflow/adapter/pom.xml index 118815329517..37996a8a93d4 100644 --- a/features/telemetry/protocols/netflow/adapter/pom.xml +++ b/features/telemetry/protocols/netflow/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.netflow - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.netflow diff --git a/features/telemetry/protocols/netflow/parser/pom.xml b/features/telemetry/protocols/netflow/parser/pom.xml index 71228477ca40..464c527eb05a 100644 --- a/features/telemetry/protocols/netflow/parser/pom.xml +++ b/features/telemetry/protocols/netflow/parser/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.netflow - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.netflow diff --git a/features/telemetry/protocols/netflow/pom.xml b/features/telemetry/protocols/netflow/pom.xml index 21fbe2ef9e37..05cf8bb5d3ff 100644 --- a/features/telemetry/protocols/netflow/pom.xml +++ b/features/telemetry/protocols/netflow/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/netflow/transport/pom.xml b/features/telemetry/protocols/netflow/transport/pom.xml index a5b2ced4f4b1..af83f0eb5897 100644 --- a/features/telemetry/protocols/netflow/transport/pom.xml +++ b/features/telemetry/protocols/netflow/transport/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.netflow org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/nxos/adapter/pom.xml b/features/telemetry/protocols/nxos/adapter/pom.xml index 0b995ccd0800..b37cbef53889 100644 --- a/features/telemetry/protocols/nxos/adapter/pom.xml +++ b/features/telemetry/protocols/nxos/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.nxos - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.nxos diff --git a/features/telemetry/protocols/nxos/pom.xml b/features/telemetry/protocols/nxos/pom.xml index 1372f0777bc9..f9612a707e09 100644 --- a/features/telemetry/protocols/nxos/pom.xml +++ b/features/telemetry/protocols/nxos/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/protocols/openconfig/adapter/pom.xml b/features/telemetry/protocols/openconfig/adapter/pom.xml index 366efa1a6c5c..59cb11d0e116 100644 --- a/features/telemetry/protocols/openconfig/adapter/pom.xml +++ b/features/telemetry/protocols/openconfig/adapter/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.openconfig org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/openconfig/connector/pom.xml b/features/telemetry/protocols/openconfig/connector/pom.xml index 8f7d4f173e84..b0c4be374bea 100644 --- a/features/telemetry/protocols/openconfig/connector/pom.xml +++ b/features/telemetry/protocols/openconfig/connector/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.openconfig org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/openconfig/itests/pom.xml b/features/telemetry/protocols/openconfig/itests/pom.xml index 23f0dbf4fc87..1a36b360c9ba 100644 --- a/features/telemetry/protocols/openconfig/itests/pom.xml +++ b/features/telemetry/protocols/openconfig/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols.openconfig org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/openconfig/pom.xml b/features/telemetry/protocols/openconfig/pom.xml index e268317db651..16af4a0e5f72 100644 --- a/features/telemetry/protocols/openconfig/pom.xml +++ b/features/telemetry/protocols/openconfig/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/telemetry/protocols/pom.xml b/features/telemetry/protocols/pom.xml index 1333e5c2af79..45b59b8a88af 100644 --- a/features/telemetry/protocols/pom.xml +++ b/features/telemetry/protocols/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/protocols/sflow/adapter/pom.xml b/features/telemetry/protocols/sflow/adapter/pom.xml index 9d47ef3f6476..c9818d475465 100644 --- a/features/telemetry/protocols/sflow/adapter/pom.xml +++ b/features/telemetry/protocols/sflow/adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.sflow - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.sflow diff --git a/features/telemetry/protocols/sflow/parser/pom.xml b/features/telemetry/protocols/sflow/parser/pom.xml index 239104efd4c4..fa6a98d86e6d 100644 --- a/features/telemetry/protocols/sflow/parser/pom.xml +++ b/features/telemetry/protocols/sflow/parser/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry.protocols org.opennms.features.telemetry.protocols.sflow - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols.sflow diff --git a/features/telemetry/protocols/sflow/pom.xml b/features/telemetry/protocols/sflow/pom.xml index 488797a8956c..342c83d3df86 100644 --- a/features/telemetry/protocols/sflow/pom.xml +++ b/features/telemetry/protocols/sflow/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry.protocols diff --git a/features/telemetry/registry/pom.xml b/features/telemetry/registry/pom.xml index 2b8773629c4f..74b27188d092 100644 --- a/features/telemetry/registry/pom.xml +++ b/features/telemetry/registry/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/shell/pom.xml b/features/telemetry/shell/pom.xml index 6dbc21de1106..5e6ba4c36d42 100644 --- a/features/telemetry/shell/pom.xml +++ b/features/telemetry/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/themes/dashboard-theme/pom.xml b/features/themes/dashboard-theme/pom.xml index 055aca8bbc71..bf0a9dbfd8e2 100644 --- a/features/themes/dashboard-theme/pom.xml +++ b/features/themes/dashboard-theme/pom.xml @@ -6,7 +6,7 @@ themes org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.themes diff --git a/features/themes/jmxconfiggenerator-theme/pom.xml b/features/themes/jmxconfiggenerator-theme/pom.xml index b4572c823a8c..027e02227c87 100644 --- a/features/themes/jmxconfiggenerator-theme/pom.xml +++ b/features/themes/jmxconfiggenerator-theme/pom.xml @@ -5,7 +5,7 @@ themes org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.themes jmxconfiggenerator-theme diff --git a/features/themes/onms-default-theme/bin/pom.xml b/features/themes/onms-default-theme/bin/pom.xml index c5c69422a781..ee87ebe5d79c 100644 --- a/features/themes/onms-default-theme/bin/pom.xml +++ b/features/themes/onms-default-theme/bin/pom.xml @@ -6,7 +6,7 @@ themes org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.themes diff --git a/features/themes/onms-default-theme/pom.xml b/features/themes/onms-default-theme/pom.xml index c5c69422a781..ee87ebe5d79c 100644 --- a/features/themes/onms-default-theme/pom.xml +++ b/features/themes/onms-default-theme/pom.xml @@ -6,7 +6,7 @@ themes org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.themes diff --git a/features/themes/pom.xml b/features/themes/pom.xml index 043a49c6a2f4..c5d9d5153213 100644 --- a/features/themes/pom.xml +++ b/features/themes/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/ticketing/api/pom.xml b/features/ticketing/api/pom.xml index 6dca701306cd..1fa628c8e6d6 100644 --- a/features/ticketing/api/pom.xml +++ b/features/ticketing/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/daemon/pom.xml b/features/ticketing/daemon/pom.xml index 01ec0dab18cc..17e397c0332d 100644 --- a/features/ticketing/daemon/pom.xml +++ b/features/ticketing/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/drools-integration/pom.xml b/features/ticketing/drools-integration/pom.xml index 5c3d74461880..60ad19ab0e00 100644 --- a/features/ticketing/drools-integration/pom.xml +++ b/features/ticketing/drools-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/inmemory/pom.xml b/features/ticketing/inmemory/pom.xml index 1cbd7b56d065..8e555cfaf6c1 100644 --- a/features/ticketing/inmemory/pom.xml +++ b/features/ticketing/inmemory/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.ticketing org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/ticketing/jira-client/pom.xml b/features/ticketing/jira-client/pom.xml index d3437aa8626f..8d6e353d1714 100644 --- a/features/ticketing/jira-client/pom.xml +++ b/features/ticketing/jira-client/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 bundle diff --git a/features/ticketing/jira-integration/pom.xml b/features/ticketing/jira-integration/pom.xml index eac21114ee6e..2150472ce116 100644 --- a/features/ticketing/jira-integration/pom.xml +++ b/features/ticketing/jira-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 jira-troubleticketer diff --git a/features/ticketing/pom.xml b/features/ticketing/pom.xml index ae3b511ccff7..cd2adeb3b616 100644 --- a/features/ticketing/pom.xml +++ b/features/ticketing/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/ticketing/rt-integration/pom.xml b/features/ticketing/rt-integration/pom.xml index 7af28147f227..5d297abe4b96 100644 --- a/features/ticketing/rt-integration/pom.xml +++ b/features/ticketing/rt-integration/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-integration-rt diff --git a/features/ticketing/tsrm-integration/pom.xml b/features/ticketing/tsrm-integration/pom.xml index 19c41ad5934e..37c596b5879d 100644 --- a/features/ticketing/tsrm-integration/pom.xml +++ b/features/ticketing/tsrm-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-integration-tsrm diff --git a/features/timeformat/api/pom.xml b/features/timeformat/api/pom.xml index 777104d41fdf..ce8af522ce69 100644 --- a/features/timeformat/api/pom.xml +++ b/features/timeformat/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.timeformat - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.timeformat diff --git a/features/timeformat/impl/pom.xml b/features/timeformat/impl/pom.xml index 901afa2b2975..05635d1f22b0 100644 --- a/features/timeformat/impl/pom.xml +++ b/features/timeformat/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.timeformat - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.timeformat diff --git a/features/timeformat/pom.xml b/features/timeformat/pom.xml index 884e0696bf87..60ad8441ff31 100644 --- a/features/timeformat/pom.xml +++ b/features/timeformat/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/timeseries-evaluate/pom.xml b/features/timeseries-evaluate/pom.xml index 516d4cd7ecd2..a05a24241a45 100644 --- a/features/timeseries-evaluate/pom.xml +++ b/features/timeseries-evaluate/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/timeseries-shell/pom.xml b/features/timeseries-shell/pom.xml index d3591e7e007c..4ad7c8d38d4b 100644 --- a/features/timeseries-shell/pom.xml +++ b/features/timeseries-shell/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/timeseries/pom.xml b/features/timeseries/pom.xml index cd8a69ae06a4..8078fbba42c3 100644 --- a/features/timeseries/pom.xml +++ b/features/timeseries/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/topologies/pom.xml b/features/topologies/pom.xml index 0c3e7167da09..6721ebf7b1f8 100644 --- a/features/topologies/pom.xml +++ b/features/topologies/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/topologies/service/api/pom.xml b/features/topologies/service/api/pom.xml index e8481f3af88f..175175acb3a9 100644 --- a/features/topologies/service/api/pom.xml +++ b/features/topologies/service/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topologies org.opennms.features.topologies.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topologies.service.api diff --git a/features/topologies/service/impl/pom.xml b/features/topologies/service/impl/pom.xml index 933fdb8613ce..9dd3aff7ad17 100644 --- a/features/topologies/service/impl/pom.xml +++ b/features/topologies/service/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topologies org.opennms.features.topologies.service - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topologies.service.impl diff --git a/features/topologies/service/pom.xml b/features/topologies/service/pom.xml index 6d07debccef4..5cf58e25af53 100644 --- a/features/topologies/service/pom.xml +++ b/features/topologies/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.topologies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topologies diff --git a/features/topology-map/features/pom.xml b/features/topology-map/features/pom.xml index 3828a4f7e0b3..dcfab4dfc84c 100644 --- a/features/topology-map/features/pom.xml +++ b/features/topology-map/features/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-base/pom.xml b/features/topology-map/features/runtime-base/pom.xml index 5a1e45245eef..0c144ea2a5b4 100644 --- a/features/topology-map/features/runtime-base/pom.xml +++ b/features/topology-map/features/runtime-base/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-graphml/pom.xml b/features/topology-map/features/runtime-graphml/pom.xml index d19875900731..3fa9dbf897b2 100644 --- a/features/topology-map/features/runtime-graphml/pom.xml +++ b/features/topology-map/features/runtime-graphml/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topology features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.osgi.features.topology diff --git a/features/topology-map/org.opennms.features.topology.api/pom.xml b/features/topology-map/org.opennms.features.topology.api/pom.xml index 1c06b3845c14..49054bf19d83 100644 --- a/features/topology-map/org.opennms.features.topology.api/pom.xml +++ b/features/topology-map/org.opennms.features.topology.api/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/topology-map/org.opennms.features.topology.app/pom.xml b/features/topology-map/org.opennms.features.topology.app/pom.xml index 3420eb22fef3..2080c43adb99 100644 --- a/features/topology-map/org.opennms.features.topology.app/pom.xml +++ b/features/topology-map/org.opennms.features.topology.app/pom.xml @@ -6,7 +6,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/org.opennms.features.topology.link/pom.xml b/features/topology-map/org.opennms.features.topology.link/pom.xml index 9258d83a97f8..2165490b2cdd 100644 --- a/features/topology-map/org.opennms.features.topology.link/pom.xml +++ b/features/topology-map/org.opennms.features.topology.link/pom.xml @@ -4,7 +4,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.link diff --git a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml index c499d517ede3..1b4f6b13d96a 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml index 717d879e50d2..6a04a70a9d6c 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.persistence/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/pom.xml index 4777b19af268..5bee63f5c71f 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.shell/pom.xml b/features/topology-map/org.opennms.features.topology.shell/pom.xml index 7729f1abbd57..b0644aa36241 100644 --- a/features/topology-map/org.opennms.features.topology.shell/pom.xml +++ b/features/topology-map/org.opennms.features.topology.shell/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.shell diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml index 127bda714fcf..15b61fc3ccdd 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.browsers diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml index 1cd8d838f661..13282492ab25 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml index 70201ac57c0f..003ce89a1232 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml @@ -7,7 +7,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml index 47039bfae90f..ab4ea937bc79 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo.application diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml index 2b745b78c926..a3cd3a70bb2a 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo.asset diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml index c3d5bba5ce5e..abe150324467 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo.bsm diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml index de9c97c1d57f..be020b3e290e 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo.graphml diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml index 0e09a16cbff8..f1d9f8999f6f 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.topology.plugins org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml index 3d37c6a94f6e..10bad75caa3f 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml index 42ea7874a6bc..593058faf09c 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml @@ -7,7 +7,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml index 15ecc74e2185..ea0e0ea9b214 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.plugins.topo.vmware diff --git a/features/topology-map/plugins/pom.xml b/features/topology-map/plugins/pom.xml index f6b9428c7b8d..d14f30fd8049 100644 --- a/features/topology-map/plugins/pom.xml +++ b/features/topology-map/plugins/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/pom.xml b/features/topology-map/pom.xml index fdcf8b3a2f0c..ebb56e9a9982 100644 --- a/features/topology-map/pom.xml +++ b/features/topology-map/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/compiled/pom.xml b/features/topology-map/poms/compiled/pom.xml index 9b409203345d..4bf38d6b86bb 100644 --- a/features/topology-map/poms/compiled/pom.xml +++ b/features/topology-map/poms/compiled/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.topology.build shared-plugin-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/pom.xml b/features/topology-map/poms/pom.xml index 8b6dde8e8b9d..3aba590d186d 100644 --- a/features/topology-map/poms/pom.xml +++ b/features/topology-map/poms/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/wrappers/pom.xml b/features/topology-map/poms/wrappers/pom.xml index 403ca66e97d9..41e3b31c3a67 100644 --- a/features/topology-map/poms/wrappers/pom.xml +++ b/features/topology-map/poms/wrappers/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.topology.build shared-plugin-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/provision/pom.xml b/features/topology-map/provision/pom.xml index f3585165d653..14ecd6dcd75b 100644 --- a/features/topology-map/provision/pom.xml +++ b/features/topology-map/provision/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/topology-map/themes/default-theme/pom.xml b/features/topology-map/themes/default-theme/pom.xml index 3697e366ca6d..fbb29d7b8b13 100644 --- a/features/topology-map/themes/default-theme/pom.xml +++ b/features/topology-map/themes/default-theme/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology.themes org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.topology.themes org.opennms.features.topology.themes.default-theme diff --git a/features/topology-map/themes/pom.xml b/features/topology-map/themes/pom.xml index 5e8137a31123..d01494c297cc 100644 --- a/features/topology-map/themes/pom.xml +++ b/features/topology-map/themes/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.topology - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/ui-extension/pom.xml b/features/ui-extension/pom.xml index e84b5af2676c..4e5b3e5c309a 100644 --- a/features/ui-extension/pom.xml +++ b/features/ui-extension/pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features ui-extension diff --git a/features/usageanalytics/api/pom.xml b/features/usageanalytics/api/pom.xml index d965f1663f46..baaeb71e2de4 100644 --- a/features/usageanalytics/api/pom.xml +++ b/features/usageanalytics/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.usageanalytics org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.usageanalytics diff --git a/features/usageanalytics/impl/pom.xml b/features/usageanalytics/impl/pom.xml index 41cc03d731d6..47a5f8ff7845 100644 --- a/features/usageanalytics/impl/pom.xml +++ b/features/usageanalytics/impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.usageanalytics org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.usageanalytics diff --git a/features/usageanalytics/pom.xml b/features/usageanalytics/pom.xml index ea7f9a55a949..8f8ef79f7c8e 100644 --- a/features/usageanalytics/pom.xml +++ b/features/usageanalytics/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features @@ -14,7 +14,7 @@ The Usage Analytics package will be used to store and provide with access to usage analytics data. 4.0.0 - 32.0.2 + 32.0.3-SNAPSHOT pom diff --git a/features/vaadin-components/core/pom.xml b/features/vaadin-components/core/pom.xml index 6a34e022368d..1be5b164e038 100644 --- a/features/vaadin-components/core/pom.xml +++ b/features/vaadin-components/core/pom.xml @@ -5,7 +5,7 @@ org.opennms.features vaadin-components - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-components core diff --git a/features/vaadin-components/extender-service/pom.xml b/features/vaadin-components/extender-service/pom.xml index 44049878612f..3e6ecf9bd2ad 100644 --- a/features/vaadin-components/extender-service/pom.xml +++ b/features/vaadin-components/extender-service/pom.xml @@ -4,7 +4,7 @@ org.opennms.features vaadin-components - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-components extender-service diff --git a/features/vaadin-components/graph/pom.xml b/features/vaadin-components/graph/pom.xml index e6988e1c9798..83b032381fbb 100644 --- a/features/vaadin-components/graph/pom.xml +++ b/features/vaadin-components/graph/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-components diff --git a/features/vaadin-components/header/pom.xml b/features/vaadin-components/header/pom.xml index 2d9625622013..73582565da69 100644 --- a/features/vaadin-components/header/pom.xml +++ b/features/vaadin-components/header/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-components header diff --git a/features/vaadin-components/pom.xml b/features/vaadin-components/pom.xml index 7d641d2719ad..24f9a79f66f8 100644 --- a/features/vaadin-components/pom.xml +++ b/features/vaadin-components/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/vaadin-components/widgetset/pom.xml b/features/vaadin-components/widgetset/pom.xml index 2a6a24c24e3b..a1ea1eb41916 100644 --- a/features/vaadin-components/widgetset/pom.xml +++ b/features/vaadin-components/widgetset/pom.xml @@ -4,7 +4,7 @@ org.opennms.features vaadin-components - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features.vaadin-components diff --git a/features/vaadin-dashboard/pom.xml b/features/vaadin-dashboard/pom.xml index 8cc082efb430..0dc1ebbe4b7f 100644 --- a/features/vaadin-dashboard/pom.xml +++ b/features/vaadin-dashboard/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features vaadin-dashboard diff --git a/features/vaadin-dashlets/dashlet-alarms/pom.xml b/features/vaadin-dashlets/dashlet-alarms/pom.xml index e9267df1ec15..fd793c8399c9 100644 --- a/features/vaadin-dashlets/dashlet-alarms/pom.xml +++ b/features/vaadin-dashlets/dashlet-alarms/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-bsm/pom.xml b/features/vaadin-dashlets/dashlet-bsm/pom.xml index 10218bd8a243..063a071efcf7 100644 --- a/features/vaadin-dashlets/dashlet-bsm/pom.xml +++ b/features/vaadin-dashlets/dashlet-bsm/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-charts/pom.xml b/features/vaadin-dashlets/dashlet-charts/pom.xml index 6e120e8b7d54..aafba1048d6e 100644 --- a/features/vaadin-dashlets/dashlet-charts/pom.xml +++ b/features/vaadin-dashlets/dashlet-charts/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-features/pom.xml b/features/vaadin-dashlets/dashlet-features/pom.xml index 793714f8ea52..8c609de67404 100644 --- a/features/vaadin-dashlets/dashlet-features/pom.xml +++ b/features/vaadin-dashlets/dashlet-features/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-grafana/pom.xml b/features/vaadin-dashlets/dashlet-grafana/pom.xml index e85ea7868090..9be5bb8c74c4 100644 --- a/features/vaadin-dashlets/dashlet-grafana/pom.xml +++ b/features/vaadin-dashlets/dashlet-grafana/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-image/pom.xml b/features/vaadin-dashlets/dashlet-image/pom.xml index 6a48062b58e9..9cbb644ca453 100644 --- a/features/vaadin-dashlets/dashlet-image/pom.xml +++ b/features/vaadin-dashlets/dashlet-image/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-ksc/pom.xml b/features/vaadin-dashlets/dashlet-ksc/pom.xml index 5b7cdcdfa792..92caabdab97f 100644 --- a/features/vaadin-dashlets/dashlet-ksc/pom.xml +++ b/features/vaadin-dashlets/dashlet-ksc/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-map/pom.xml b/features/vaadin-dashlets/dashlet-map/pom.xml index 1b9fcddec28e..ada5b7041e85 100644 --- a/features/vaadin-dashlets/dashlet-map/pom.xml +++ b/features/vaadin-dashlets/dashlet-map/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-rrd/pom.xml b/features/vaadin-dashlets/dashlet-rrd/pom.xml index 684e0c4a039d..bf6c28b36f2c 100644 --- a/features/vaadin-dashlets/dashlet-rrd/pom.xml +++ b/features/vaadin-dashlets/dashlet-rrd/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-rtc/pom.xml b/features/vaadin-dashlets/dashlet-rtc/pom.xml index 9505a73dc59e..30c71d1d93b8 100644 --- a/features/vaadin-dashlets/dashlet-rtc/pom.xml +++ b/features/vaadin-dashlets/dashlet-rtc/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-summary/pom.xml b/features/vaadin-dashlets/dashlet-summary/pom.xml index 2fb83a01e7e4..0a7bf845c111 100644 --- a/features/vaadin-dashlets/dashlet-summary/pom.xml +++ b/features/vaadin-dashlets/dashlet-summary/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-surveillance/pom.xml b/features/vaadin-dashlets/dashlet-surveillance/pom.xml index d457c9f20d2a..16f508bfc86a 100644 --- a/features/vaadin-dashlets/dashlet-surveillance/pom.xml +++ b/features/vaadin-dashlets/dashlet-surveillance/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-topology/pom.xml b/features/vaadin-dashlets/dashlet-topology/pom.xml index 2e04a98f127f..6a11a21024b2 100644 --- a/features/vaadin-dashlets/dashlet-topology/pom.xml +++ b/features/vaadin-dashlets/dashlet-topology/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-url/pom.xml b/features/vaadin-dashlets/dashlet-url/pom.xml index a88a4210d2e5..3d8e2dbb0974 100644 --- a/features/vaadin-dashlets/dashlet-url/pom.xml +++ b/features/vaadin-dashlets/dashlet-url/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/pom.xml b/features/vaadin-dashlets/pom.xml index f6de940badbf..30f16eb297e6 100644 --- a/features/vaadin-dashlets/pom.xml +++ b/features/vaadin-dashlets/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/features/vaadin-jmxconfiggenerator/pom.xml b/features/vaadin-jmxconfiggenerator/pom.xml index 2e2383ea5f22..8a707d0263a9 100644 --- a/features/vaadin-jmxconfiggenerator/pom.xml +++ b/features/vaadin-jmxconfiggenerator/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features vaadin-jmxconfiggenerator diff --git a/features/vaadin-snmp-events-and-metrics/pom.xml b/features/vaadin-snmp-events-and-metrics/pom.xml index f4645b20d843..1b34142896fb 100644 --- a/features/vaadin-snmp-events-and-metrics/pom.xml +++ b/features/vaadin-snmp-events-and-metrics/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features vaadin-snmp-events-and-metrics diff --git a/features/vaadin-surveillance-views/pom.xml b/features/vaadin-surveillance-views/pom.xml index 966ff0872df2..14e5a9add1db 100644 --- a/features/vaadin-surveillance-views/pom.xml +++ b/features/vaadin-surveillance-views/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 32.0.2 + 32.0.3-SNAPSHOT org.opennms.features vaadin-surveillance-views diff --git a/features/vaadin/pom.xml b/features/vaadin/pom.xml index fd124dfcd239..db60ae4d57d5 100644 --- a/features/vaadin/pom.xml +++ b/features/vaadin/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/wsman/pom.xml b/features/wsman/pom.xml index 80a96c310653..2126ec903155 100644 --- a/features/wsman/pom.xml +++ b/features/wsman/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.features diff --git a/integration-tests/config/pom.xml b/integration-tests/config/pom.xml index d8ac9591c5d6..74de358ba6f2 100644 --- a/integration-tests/config/pom.xml +++ b/integration-tests/config/pom.xml @@ -3,7 +3,7 @@ org.opennms integration-tests - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.integration-tests.config diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index fd2580537713..e69fcd9c5373 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 integration-tests diff --git a/integration-tests/trend-configuration/pom.xml b/integration-tests/trend-configuration/pom.xml index b5fbd8144cea..c4cb027da636 100644 --- a/integration-tests/trend-configuration/pom.xml +++ b/integration-tests/trend-configuration/pom.xml @@ -3,7 +3,7 @@ org.opennms integration-tests - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.integration-tests.trend-configuration diff --git a/integrations/opennms-R/pom.xml b/integrations/opennms-R/pom.xml index 06df048f62f5..599a79d9a716 100644 --- a/integrations/opennms-R/pom.xml +++ b/integrations/opennms-R/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT opennms-R OpenNMS :: Integrations :: R Interface diff --git a/integrations/opennms-dns-provisioning-adapter/pom.xml b/integrations/opennms-dns-provisioning-adapter/pom.xml index 3c82762c5a90..f0ddcc1ddf00 100644 --- a/integrations/opennms-dns-provisioning-adapter/pom.xml +++ b/integrations/opennms-dns-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-dns-provisioning-adapter diff --git a/integrations/opennms-geoip-provisioning-adapter/pom.xml b/integrations/opennms-geoip-provisioning-adapter/pom.xml index a0666d21f126..4ce3c59d9b8e 100644 --- a/integrations/opennms-geoip-provisioning-adapter/pom.xml +++ b/integrations/opennms-geoip-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-geoip-provisioning-adapter diff --git a/integrations/opennms-jasper-extensions/pom.xml b/integrations/opennms-jasper-extensions/pom.xml index 9ecb3758b8a1..55118861a213 100644 --- a/integrations/opennms-jasper-extensions/pom.xml +++ b/integrations/opennms-jasper-extensions/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT jasper-extensions diff --git a/integrations/opennms-jasperstudio-extension/pom.xml b/integrations/opennms-jasperstudio-extension/pom.xml index 9d1f6d92b64a..90138b608cd4 100644 --- a/integrations/opennms-jasperstudio-extension/pom.xml +++ b/integrations/opennms-jasperstudio-extension/pom.xml @@ -5,7 +5,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT opennms-jasperstudio-extension OpenNMS Integration for Jaspersoft Studio diff --git a/integrations/opennms-puppet-provisioning-adapter/pom.xml b/integrations/opennms-puppet-provisioning-adapter/pom.xml index 4e482816f917..675a77b2c917 100644 --- a/integrations/opennms-puppet-provisioning-adapter/pom.xml +++ b/integrations/opennms-puppet-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-puppet-provisioning-adapter diff --git a/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml b/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml index a43446cbe349..67329770e7ba 100644 --- a/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml +++ b/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-reverse-dns-provisioning-adapter diff --git a/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml b/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml index ba0b304fac0c..ddf5c7e78105 100644 --- a/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml +++ b/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-snmp-asset-provisioning-adapter diff --git a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml index 32e25e7ea994..bec1cae55c1e 100644 --- a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml +++ b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-snmp-hardware-inventory-provisioning-adapter diff --git a/integrations/opennms-snmp-metadata-provisioning-adapter/pom.xml b/integrations/opennms-snmp-metadata-provisioning-adapter/pom.xml index efe84ed07804..9df6e45683cb 100644 --- a/integrations/opennms-snmp-metadata-provisioning-adapter/pom.xml +++ b/integrations/opennms-snmp-metadata-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-snmp-metadata-provisioning-adapter diff --git a/integrations/opennms-vmware/pom.xml b/integrations/opennms-vmware/pom.xml index 2871c9a84913..e4168737d5d6 100644 --- a/integrations/opennms-vmware/pom.xml +++ b/integrations/opennms-vmware/pom.xml @@ -5,7 +5,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-vmware diff --git a/integrations/opennms-vtdxml-collector-handler/pom.xml b/integrations/opennms-vtdxml-collector-handler/pom.xml index 55921376c863..86cc6b7e1b14 100644 --- a/integrations/opennms-vtdxml-collector-handler/pom.xml +++ b/integrations/opennms-vtdxml-collector-handler/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-vtdxml-collector-handler diff --git a/integrations/opennms-wsman-asset-provisioning-adapter/pom.xml b/integrations/opennms-wsman-asset-provisioning-adapter/pom.xml index bf14612e0f89..f4db3007fab5 100644 --- a/integrations/opennms-wsman-asset-provisioning-adapter/pom.xml +++ b/integrations/opennms-wsman-asset-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-wsman-asset-provisioning-adapter diff --git a/integrations/pom.xml b/integrations/pom.xml index 9737f701d387..55f435cc918b 100644 --- a/integrations/pom.xml +++ b/integrations/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-integrations diff --git a/opennms-ackd/pom.xml b/opennms-ackd/pom.xml index 99b63d1b487e..a4d9a709140c 100644 --- a/opennms-ackd/pom.xml +++ b/opennms-ackd/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-ackd diff --git a/opennms-alarms/api/pom.xml b/opennms-alarms/api/pom.xml index 3004335abef7..6a5c3bd0a56a 100644 --- a/opennms-alarms/api/pom.xml +++ b/opennms-alarms/api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-api diff --git a/opennms-alarms/bsf-northbounder/pom.xml b/opennms-alarms/bsf-northbounder/pom.xml index 88a78f34ca17..2f893d651eb2 100644 --- a/opennms-alarms/bsf-northbounder/pom.xml +++ b/opennms-alarms/bsf-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-bsf diff --git a/opennms-alarms/daemon/pom.xml b/opennms-alarms/daemon/pom.xml index c122ff8df913..1d9da54af1e6 100644 --- a/opennms-alarms/daemon/pom.xml +++ b/opennms-alarms/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarmd diff --git a/opennms-alarms/drools-northbounder/pom.xml b/opennms-alarms/drools-northbounder/pom.xml index a156dba6f1f4..b555c9218d8d 100644 --- a/opennms-alarms/drools-northbounder/pom.xml +++ b/opennms-alarms/drools-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-drools diff --git a/opennms-alarms/email-northbounder/pom.xml b/opennms-alarms/email-northbounder/pom.xml index 72d8dbe1bdce..3933548dd959 100644 --- a/opennms-alarms/email-northbounder/pom.xml +++ b/opennms-alarms/email-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-email diff --git a/opennms-alarms/http-northbounder/pom.xml b/opennms-alarms/http-northbounder/pom.xml index fe14c9b4d7c4..51a62b9069a4 100644 --- a/opennms-alarms/http-northbounder/pom.xml +++ b/opennms-alarms/http-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-http diff --git a/opennms-alarms/integration-tests/pom.xml b/opennms-alarms/integration-tests/pom.xml index 54c3a9ac3f11..ed321e0aac16 100644 --- a/opennms-alarms/integration-tests/pom.xml +++ b/opennms-alarms/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-itests diff --git a/opennms-alarms/jms-northbounder/pom.xml b/opennms-alarms/jms-northbounder/pom.xml index 369aaa0f4dcd..2c8fa16e61e1 100644 --- a/opennms-alarms/jms-northbounder/pom.xml +++ b/opennms-alarms/jms-northbounder/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-jms diff --git a/opennms-alarms/pom.xml b/opennms-alarms/pom.xml index 3ef999cab212..2c2f351aa5b2 100644 --- a/opennms-alarms/pom.xml +++ b/opennms-alarms/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarms diff --git a/opennms-alarms/snmptrap-northbounder/pom.xml b/opennms-alarms/snmptrap-northbounder/pom.xml index 1f7ffafa9793..d7b0e7e2c508 100644 --- a/opennms-alarms/snmptrap-northbounder/pom.xml +++ b/opennms-alarms/snmptrap-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-snmptrap diff --git a/opennms-alarms/syslog-northbounder/pom.xml b/opennms-alarms/syslog-northbounder/pom.xml index 97b239b6737b..e16ab8cf37cf 100644 --- a/opennms-alarms/syslog-northbounder/pom.xml +++ b/opennms-alarms/syslog-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-alarm-northbounder-syslog diff --git a/opennms-assemblies/minion/pom.xml b/opennms-assemblies/minion/pom.xml index 3facee64efe4..fa4e0720c1bd 100644 --- a/opennms-assemblies/minion/pom.xml +++ b/opennms-assemblies/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/pom.xml b/opennms-assemblies/pom.xml index d6bd127da135..c2dae828e799 100644 --- a/opennms-assemblies/pom.xml +++ b/opennms-assemblies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/sentinel/pom.xml b/opennms-assemblies/sentinel/pom.xml index f79906635544..957e9f9b9724 100644 --- a/opennms-assemblies/sentinel/pom.xml +++ b/opennms-assemblies/sentinel/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/version/pom.xml b/opennms-assemblies/version/pom.xml index 1ebec4510d73..a2dea50fb189 100644 --- a/opennms-assemblies/version/pom.xml +++ b/opennms-assemblies/version/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms diff --git a/opennms-assemblies/webapp-full/pom.xml b/opennms-assemblies/webapp-full/pom.xml index cfb1d8434af2..658d8df7794d 100644 --- a/opennms-assemblies/webapp-full/pom.xml +++ b/opennms-assemblies/webapp-full/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/xsds/pom.xml b/opennms-assemblies/xsds/pom.xml index 3185da7ac93e..20c85187af72 100644 --- a/opennms-assemblies/xsds/pom.xml +++ b/opennms-assemblies/xsds/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-asterisk/pom.xml b/opennms-asterisk/pom.xml index 52a58b1934f0..7bffbc85ba97 100644 --- a/opennms-asterisk/pom.xml +++ b/opennms-asterisk/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-asterisk diff --git a/opennms-base-assembly/pom.xml b/opennms-base-assembly/pom.xml index f31efdc4b055..2368f2bfc3c5 100644 --- a/opennms-base-assembly/pom.xml +++ b/opennms-base-assembly/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-base-assembly diff --git a/opennms-base-assembly/src/main/filtered/etc/log4j2.xml b/opennms-base-assembly/src/main/filtered/etc/log4j2.xml index d2f33cc49104..5be9e24de918 100644 --- a/opennms-base-assembly/src/main/filtered/etc/log4j2.xml +++ b/opennms-base-assembly/src/main/filtered/etc/log4j2.xml @@ -202,47 +202,47 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opennms-bootstrap/pom.xml b/opennms-bootstrap/pom.xml index b73f6d51dbbc..69ceb24bdda2 100644 --- a/opennms-bootstrap/pom.xml +++ b/opennms-bootstrap/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-bootstrap diff --git a/opennms-config-api/pom.xml b/opennms-config-api/pom.xml index 8b666c85c5c0..712512775ecf 100644 --- a/opennms-config-api/pom.xml +++ b/opennms-config-api/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-config-api diff --git a/opennms-config-dao/common-api/pom.xml b/opennms-config-dao/common-api/pom.xml index f80a36a8dff7..7611078268d6 100644 --- a/opennms-config-dao/common-api/pom.xml +++ b/opennms-config-dao/common-api/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.common-api diff --git a/opennms-config-dao/common-impl/pom.xml b/opennms-config-dao/common-impl/pom.xml index 453b064bac52..38f9d997b118 100644 --- a/opennms-config-dao/common-impl/pom.xml +++ b/opennms-config-dao/common-impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.common-impl diff --git a/opennms-config-dao/poll-outages/api/pom.xml b/opennms-config-dao/poll-outages/api/pom.xml index 55839822e4e9..34073c1a6dda 100644 --- a/opennms-config-dao/poll-outages/api/pom.xml +++ b/opennms-config-dao/poll-outages/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao.poll-outages org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.poll-outages.api diff --git a/opennms-config-dao/poll-outages/impl/pom.xml b/opennms-config-dao/poll-outages/impl/pom.xml index 49996ba12c72..b6f014a6fb02 100644 --- a/opennms-config-dao/poll-outages/impl/pom.xml +++ b/opennms-config-dao/poll-outages/impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao.poll-outages org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.poll-outages.impl diff --git a/opennms-config-dao/poll-outages/itests/pom.xml b/opennms-config-dao/poll-outages/itests/pom.xml index d2af057e9ab8..a95dbaa7ee27 100644 --- a/opennms-config-dao/poll-outages/itests/pom.xml +++ b/opennms-config-dao/poll-outages/itests/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao.poll-outages org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/opennms-config-dao/poll-outages/pom.xml b/opennms-config-dao/poll-outages/pom.xml index 5204d8b132d4..5d53135a310e 100644 --- a/opennms-config-dao/poll-outages/pom.xml +++ b/opennms-config-dao/poll-outages/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.poll-outages diff --git a/opennms-config-dao/pom.xml b/opennms-config-dao/pom.xml index 15658bc2002b..746b41345616 100644 --- a/opennms-config-dao/pom.xml +++ b/opennms-config-dao/pom.xml @@ -5,7 +5,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao diff --git a/opennms-config-dao/thresholding/api/pom.xml b/opennms-config-dao/thresholding/api/pom.xml index d77e8d2d379b..c7c22cca3a4a 100644 --- a/opennms-config-dao/thresholding/api/pom.xml +++ b/opennms-config-dao/thresholding/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao.thresholding org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.thresholding.api diff --git a/opennms-config-dao/thresholding/impl/pom.xml b/opennms-config-dao/thresholding/impl/pom.xml index 6f6cc9285c0a..64ea98b0d15e 100644 --- a/opennms-config-dao/thresholding/impl/pom.xml +++ b/opennms-config-dao/thresholding/impl/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao.thresholding org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.config-dao.thresholding.impl diff --git a/opennms-config-dao/thresholding/pom.xml b/opennms-config-dao/thresholding/pom.xml index 45d6d2551348..4c7fa511f1ff 100644 --- a/opennms-config-dao/thresholding/pom.xml +++ b/opennms-config-dao/thresholding/pom.xml @@ -5,7 +5,7 @@ org.opennms.config-dao org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 diff --git a/opennms-config-jaxb/pom.xml b/opennms-config-jaxb/pom.xml index 93f146c15416..0e33331b0ea7 100644 --- a/opennms-config-jaxb/pom.xml +++ b/opennms-config-jaxb/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-config-jaxb diff --git a/opennms-config-model/pom.xml b/opennms-config-model/pom.xml index 9f66f0937baa..c493abb085ed 100644 --- a/opennms-config-model/pom.xml +++ b/opennms-config-model/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-config-model diff --git a/opennms-config-tester/pom.xml b/opennms-config-tester/pom.xml index 5570b9c59051..de197637e628 100644 --- a/opennms-config-tester/pom.xml +++ b/opennms-config-tester/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-config-tester diff --git a/opennms-config/pom.xml b/opennms-config/pom.xml index 72ee7843286f..508150a7c2d0 100644 --- a/opennms-config/pom.xml +++ b/opennms-config/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-config diff --git a/opennms-correlation/drools-correlation-engine/pom.xml b/opennms-correlation/drools-correlation-engine/pom.xml index a61061071a81..a686b7edc51b 100644 --- a/opennms-correlation/drools-correlation-engine/pom.xml +++ b/opennms-correlation/drools-correlation-engine/pom.xml @@ -34,7 +34,7 @@ opennms-correlation org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 drools-correlation-engine diff --git a/opennms-correlation/opennms-correlator/pom.xml b/opennms-correlation/opennms-correlator/pom.xml index 9ee9888574da..cd9d8a4231de 100644 --- a/opennms-correlation/opennms-correlator/pom.xml +++ b/opennms-correlation/opennms-correlator/pom.xml @@ -34,7 +34,7 @@ opennms-correlation org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-correlator diff --git a/opennms-correlation/pom.xml b/opennms-correlation/pom.xml index ae4ea2792b6a..98d78869ef76 100644 --- a/opennms-correlation/pom.xml +++ b/opennms-correlation/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-correlation diff --git a/opennms-dao-api/pom.xml b/opennms-dao-api/pom.xml index 9a4e94ba3e20..6bc40b7ccc0d 100644 --- a/opennms-dao-api/pom.xml +++ b/opennms-dao-api/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-dao-api diff --git a/opennms-dao-mock/pom.xml b/opennms-dao-mock/pom.xml index 3547b25b0b01..5293aa2f6749 100644 --- a/opennms-dao-mock/pom.xml +++ b/opennms-dao-mock/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-dao-mock diff --git a/opennms-dao/pom.xml b/opennms-dao/pom.xml index 25f28ef96ee0..8d212fc4dde9 100644 --- a/opennms-dao/pom.xml +++ b/opennms-dao/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-dao diff --git a/opennms-enterprise-reporting/opennms-reportd/pom.xml b/opennms-enterprise-reporting/opennms-reportd/pom.xml index b89ecd4b628f..cf4b0c943b3d 100644 --- a/opennms-enterprise-reporting/opennms-reportd/pom.xml +++ b/opennms-enterprise-reporting/opennms-reportd/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-enterprise-reporting - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-reportd diff --git a/opennms-enterprise-reporting/pom.xml b/opennms-enterprise-reporting/pom.xml index 0100b57f61cb..7b4fc6e42b4b 100644 --- a/opennms-enterprise-reporting/pom.xml +++ b/opennms-enterprise-reporting/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-enterprise-reporting diff --git a/opennms-full-assembly/pom.xml b/opennms-full-assembly/pom.xml index 6dbcc5decf18..5b0e13034dd1 100644 --- a/opennms-full-assembly/pom.xml +++ b/opennms-full-assembly/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT ../pom.xml opennms-full-assembly diff --git a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java index c96be2d5acb9..07cc6a565b85 100644 --- a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java +++ b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java @@ -59,7 +59,7 @@ protected MavenUrlReference getFrameworkUrl() { .groupId("org.opennms.container") .artifactId("org.opennms.container.karaf") .type("tar.gz") - .version("32.0.2"); + .version("32.0.3-SNAPSHOT"); } /** diff --git a/opennms-icmp/commands/pom.xml b/opennms-icmp/commands/pom.xml index 2ab0a4116043..115b94f24838 100644 --- a/opennms-icmp/commands/pom.xml +++ b/opennms-icmp/commands/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-commands diff --git a/opennms-icmp/opennms-icmp-api/pom.xml b/opennms-icmp/opennms-icmp-api/pom.xml index 1fdf7d42603a..3aaba84b0d4f 100644 --- a/opennms-icmp/opennms-icmp-api/pom.xml +++ b/opennms-icmp/opennms-icmp-api/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-api diff --git a/opennms-icmp/opennms-icmp-best/pom.xml b/opennms-icmp/opennms-icmp-best/pom.xml index ed7f3f0755cb..174eb2d0b372 100644 --- a/opennms-icmp/opennms-icmp-best/pom.xml +++ b/opennms-icmp/opennms-icmp-best/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-best diff --git a/opennms-icmp/opennms-icmp-jna/pom.xml b/opennms-icmp/opennms-icmp-jna/pom.xml index 5dba93814c8a..71489b1b7cfd 100644 --- a/opennms-icmp/opennms-icmp-jna/pom.xml +++ b/opennms-icmp/opennms-icmp-jna/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-jna diff --git a/opennms-icmp/opennms-icmp-jni/pom.xml b/opennms-icmp/opennms-icmp-jni/pom.xml index 02194372b18d..fd6b7141926d 100644 --- a/opennms-icmp/opennms-icmp-jni/pom.xml +++ b/opennms-icmp/opennms-icmp-jni/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-jni diff --git a/opennms-icmp/opennms-icmp-jni6/pom.xml b/opennms-icmp/opennms-icmp-jni6/pom.xml index bd9c0559a2f2..3f836f6b1f34 100644 --- a/opennms-icmp/opennms-icmp-jni6/pom.xml +++ b/opennms-icmp/opennms-icmp-jni6/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp-jni6 diff --git a/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml b/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml index 8f8243ba8e25..f794cdbcb6ff 100644 --- a/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml +++ b/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-icmp - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.icmp.proxy.rpc-impl diff --git a/opennms-icmp/pom.xml b/opennms-icmp/pom.xml index afb7e97a1f01..2549de561588 100644 --- a/opennms-icmp/pom.xml +++ b/opennms-icmp/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-icmp diff --git a/opennms-install/pom.xml b/opennms-install/pom.xml index 702bab917478..d4259736bd53 100644 --- a/opennms-install/pom.xml +++ b/opennms-install/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-install diff --git a/opennms-javamail/opennms-javamail-api/pom.xml b/opennms-javamail/opennms-javamail-api/pom.xml index 95d9e01277ce..bd6d2ad805f4 100644 --- a/opennms-javamail/opennms-javamail-api/pom.xml +++ b/opennms-javamail/opennms-javamail-api/pom.xml @@ -3,7 +3,7 @@ opennms-javamail org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-javamail-api diff --git a/opennms-javamail/pom.xml b/opennms-javamail/pom.xml index 8b8f85a4b228..b777c740951e 100644 --- a/opennms-javamail/pom.xml +++ b/opennms-javamail/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-javamail diff --git a/opennms-jetty/pom.xml b/opennms-jetty/pom.xml index 6e154daee64a..0b567c0c194c 100644 --- a/opennms-jetty/pom.xml +++ b/opennms-jetty/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-jetty diff --git a/opennms-model/pom.xml b/opennms-model/pom.xml index 503969d24f9a..d7b6d5a8028f 100644 --- a/opennms-model/pom.xml +++ b/opennms-model/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-model diff --git a/opennms-provision/opennms-detector-bsf/pom.xml b/opennms-provision/opennms-detector-bsf/pom.xml index 8e0bc848e3a3..1268628fad71 100644 --- a/opennms-provision/opennms-detector-bsf/pom.xml +++ b/opennms-provision/opennms-detector-bsf/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-bsf diff --git a/opennms-provision/opennms-detector-datagram/pom.xml b/opennms-provision/opennms-detector-datagram/pom.xml index 151ab8736d2d..b9c4a71bca9b 100644 --- a/opennms-provision/opennms-detector-datagram/pom.xml +++ b/opennms-provision/opennms-detector-datagram/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-datagram diff --git a/opennms-provision/opennms-detector-dhcp/pom.xml b/opennms-provision/opennms-detector-dhcp/pom.xml index eb7380874aaf..a7d36a0ebb08 100644 --- a/opennms-provision/opennms-detector-dhcp/pom.xml +++ b/opennms-provision/opennms-detector-dhcp/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-dhcp diff --git a/opennms-provision/opennms-detector-generic/pom.xml b/opennms-provision/opennms-detector-generic/pom.xml index 74aeb8ab0577..991e3c371127 100644 --- a/opennms-provision/opennms-detector-generic/pom.xml +++ b/opennms-provision/opennms-detector-generic/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-generic diff --git a/opennms-provision/opennms-detector-jdbc/pom.xml b/opennms-provision/opennms-detector-jdbc/pom.xml index a89dc0ca3624..38e5c7c2ffcf 100644 --- a/opennms-provision/opennms-detector-jdbc/pom.xml +++ b/opennms-provision/opennms-detector-jdbc/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-jdbc diff --git a/opennms-provision/opennms-detector-jms/pom.xml b/opennms-provision/opennms-detector-jms/pom.xml index 5d51092136c0..30b78e14da99 100644 --- a/opennms-provision/opennms-detector-jms/pom.xml +++ b/opennms-provision/opennms-detector-jms/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-jms diff --git a/opennms-provision/opennms-detector-jmx/pom.xml b/opennms-provision/opennms-detector-jmx/pom.xml index bfeec00892ae..104029ff38ee 100644 --- a/opennms-provision/opennms-detector-jmx/pom.xml +++ b/opennms-provision/opennms-detector-jmx/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-jmx diff --git a/opennms-provision/opennms-detector-lineoriented/pom.xml b/opennms-provision/opennms-detector-lineoriented/pom.xml index 87b61232f976..7a24806b4678 100644 --- a/opennms-provision/opennms-detector-lineoriented/pom.xml +++ b/opennms-provision/opennms-detector-lineoriented/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-lineoriented diff --git a/opennms-provision/opennms-detector-rdns-lookup/pom.xml b/opennms-provision/opennms-detector-rdns-lookup/pom.xml index 4116da745db1..2f5068e10d78 100644 --- a/opennms-provision/opennms-detector-rdns-lookup/pom.xml +++ b/opennms-provision/opennms-detector-rdns-lookup/pom.xml @@ -5,7 +5,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-rdns-lookup diff --git a/opennms-provision/opennms-detector-registry/pom.xml b/opennms-provision/opennms-detector-registry/pom.xml index 72bf2004a25e..f0a279798d9f 100644 --- a/opennms-provision/opennms-detector-registry/pom.xml +++ b/opennms-provision/opennms-detector-registry/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-registry diff --git a/opennms-provision/opennms-detector-simple/pom.xml b/opennms-provision/opennms-detector-simple/pom.xml index 2175de4bb860..01142fd35750 100644 --- a/opennms-provision/opennms-detector-simple/pom.xml +++ b/opennms-provision/opennms-detector-simple/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-simple diff --git a/opennms-provision/opennms-detector-ssh/pom.xml b/opennms-provision/opennms-detector-ssh/pom.xml index d26856b1e67e..b8c32051d059 100644 --- a/opennms-provision/opennms-detector-ssh/pom.xml +++ b/opennms-provision/opennms-detector-ssh/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-ssh diff --git a/opennms-provision/opennms-detector-web/pom.xml b/opennms-provision/opennms-detector-web/pom.xml index 21e448f3379e..591b0239a511 100644 --- a/opennms-provision/opennms-detector-web/pom.xml +++ b/opennms-provision/opennms-detector-web/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detector-web diff --git a/opennms-provision/opennms-detectorclient-rpc/pom.xml b/opennms-provision/opennms-detectorclient-rpc/pom.xml index f4cd19d098fc..dd8dbc41fe0a 100644 --- a/opennms-provision/opennms-detectorclient-rpc/pom.xml +++ b/opennms-provision/opennms-detectorclient-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-detectorclient-rpc diff --git a/opennms-provision/opennms-mock-simpleserver/pom.xml b/opennms-provision/opennms-mock-simpleserver/pom.xml index 776562ffb508..0cbd8dd74c49 100644 --- a/opennms-provision/opennms-mock-simpleserver/pom.xml +++ b/opennms-provision/opennms-mock-simpleserver/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-mock-simpleserver diff --git a/opennms-provision/opennms-provision-api/pom.xml b/opennms-provision/opennms-provision-api/pom.xml index 5e7a2ed5fe47..612e4292161c 100644 --- a/opennms-provision/opennms-provision-api/pom.xml +++ b/opennms-provision/opennms-provision-api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provision-api diff --git a/opennms-provision/opennms-provision-geolocation/pom.xml b/opennms-provision/opennms-provision-geolocation/pom.xml index f4eac5022e7d..634be6fa1dd0 100644 --- a/opennms-provision/opennms-provision-geolocation/pom.xml +++ b/opennms-provision/opennms-provision-geolocation/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provision-geolocation diff --git a/opennms-provision/opennms-provision-persistence/pom.xml b/opennms-provision/opennms-provision-persistence/pom.xml index 473641ace0a7..ab1b88fc5c08 100644 --- a/opennms-provision/opennms-provision-persistence/pom.xml +++ b/opennms-provision/opennms-provision-persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provision-persistence diff --git a/opennms-provision/opennms-provision-shell/pom.xml b/opennms-provision/opennms-provision-shell/pom.xml index 7d9f199ae4bb..4dd571735c88 100644 --- a/opennms-provision/opennms-provision-shell/pom.xml +++ b/opennms-provision/opennms-provision-shell/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provision-shell diff --git a/opennms-provision/opennms-provisiond/pom.xml b/opennms-provision/opennms-provisiond/pom.xml index 179d67543001..2502ab089240 100644 --- a/opennms-provision/opennms-provisiond/pom.xml +++ b/opennms-provision/opennms-provisiond/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provisiond diff --git a/opennms-provision/opennms-requisition-dns/pom.xml b/opennms-provision/opennms-requisition-dns/pom.xml index ac3f09742831..9a086dcc0db5 100644 --- a/opennms-provision/opennms-requisition-dns/pom.xml +++ b/opennms-provision/opennms-requisition-dns/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-requisition-dns diff --git a/opennms-provision/opennms-requisition-service/pom.xml b/opennms-provision/opennms-requisition-service/pom.xml index 5591715a5dcb..99583a8ed4bc 100644 --- a/opennms-provision/opennms-requisition-service/pom.xml +++ b/opennms-provision/opennms-requisition-service/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-requisition-service diff --git a/opennms-provision/opennms-snmp-scanners/pom.xml b/opennms-provision/opennms-snmp-scanners/pom.xml index 63c1cfb3ee8e..e4d43adf2b19 100644 --- a/opennms-provision/opennms-snmp-scanners/pom.xml +++ b/opennms-provision/opennms-snmp-scanners/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-snmp-scanners diff --git a/opennms-provision/pom.xml b/opennms-provision/pom.xml index 0b3849004ac1..f0acbb351412 100644 --- a/opennms-provision/pom.xml +++ b/opennms-provision/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-provision diff --git a/opennms-rrd/opennms-rrd-api/pom.xml b/opennms-rrd/opennms-rrd-api/pom.xml index b828425b7c34..a3f3c9c5790b 100644 --- a/opennms-rrd/opennms-rrd-api/pom.xml +++ b/opennms-rrd/opennms-rrd-api/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd-api diff --git a/opennms-rrd/opennms-rrd-jrobin/pom.xml b/opennms-rrd/opennms-rrd-jrobin/pom.xml index f8cfe7d07ff1..a6b1fe1427b9 100644 --- a/opennms-rrd/opennms-rrd-jrobin/pom.xml +++ b/opennms-rrd/opennms-rrd-jrobin/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd-jrobin diff --git a/opennms-rrd/opennms-rrd-model/pom.xml b/opennms-rrd/opennms-rrd-model/pom.xml index 214571fc844d..268f54d56d6b 100644 --- a/opennms-rrd/opennms-rrd-model/pom.xml +++ b/opennms-rrd/opennms-rrd-model/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd-model diff --git a/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml b/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml index a1c64a9a715f..336aaf90a8e5 100644 --- a/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml +++ b/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml @@ -3,7 +3,7 @@ opennms-rrd-rrdtool org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrdtool-api diff --git a/opennms-rrd/opennms-rrd-rrdtool/pom.xml b/opennms-rrd/opennms-rrd-rrdtool/pom.xml index dd31c1873d0c..0a081577766b 100644 --- a/opennms-rrd/opennms-rrd-rrdtool/pom.xml +++ b/opennms-rrd/opennms-rrd-rrdtool/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd-rrdtool diff --git a/opennms-rrd/opennms-rrd-tcp/pom.xml b/opennms-rrd/opennms-rrd-tcp/pom.xml index a2e253944e40..593972d14877 100644 --- a/opennms-rrd/opennms-rrd-tcp/pom.xml +++ b/opennms-rrd/opennms-rrd-tcp/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd-tcp diff --git a/opennms-rrd/pom.xml b/opennms-rrd/pom.xml index cffc11b86ad5..0dc67aa31bbb 100644 --- a/opennms-rrd/pom.xml +++ b/opennms-rrd/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-rrd diff --git a/opennms-services/pom.xml b/opennms-services/pom.xml index 3597428514d0..60e72319bdc4 100644 --- a/opennms-services/pom.xml +++ b/opennms-services/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-services diff --git a/opennms-taglib/pom.xml b/opennms-taglib/pom.xml index bb63e9a359e3..02bf736ec1d5 100644 --- a/opennms-taglib/pom.xml +++ b/opennms-taglib/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-taglib diff --git a/opennms-util/pom.xml b/opennms-util/pom.xml index eebd38bdcae3..c599dde4f8cd 100644 --- a/opennms-util/pom.xml +++ b/opennms-util/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-util diff --git a/opennms-web-api/pom.xml b/opennms-web-api/pom.xml index 71ec22377522..ba538a7aa9fd 100644 --- a/opennms-web-api/pom.xml +++ b/opennms-web-api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-web-api diff --git a/opennms-web-dependencies/pom.xml b/opennms-web-dependencies/pom.xml index 42008bb1b81d..a7ddae18f9cf 100644 --- a/opennms-web-dependencies/pom.xml +++ b/opennms-web-dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms diff --git a/opennms-webapp-rest/pom.xml b/opennms-webapp-rest/pom.xml index 5ff92c86327c..e097233cd892 100644 --- a/opennms-webapp-rest/pom.xml +++ b/opennms-webapp-rest/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-webapp-rest diff --git a/opennms-webapp/pom.xml b/opennms-webapp/pom.xml index f3d9d1f37990..bf7fb86204b3 100644 --- a/opennms-webapp/pom.xml +++ b/opennms-webapp/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-webapp diff --git a/opennms-wmi/pom.xml b/opennms-wmi/pom.xml index 63d6cfba630e..217db1b1afcb 100644 --- a/opennms-wmi/pom.xml +++ b/opennms-wmi/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 opennms-wmi diff --git a/pom.xml b/pom.xml index ba9536aee3f8..07fccb57abe6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT pom OpenNMS http://opennms.org/ @@ -1518,7 +1518,7 @@ ${project.version} ${install.version} ${dist.dir}/${dist.name} - 32.0.2 + 32.0.3.SNAPSHOT ${project.basedir} ${root.dir}/target opennms-${project.version} diff --git a/protocols/cifs/pom.xml b/protocols/cifs/pom.xml index cc4ea64b5181..22705ca99433 100644 --- a/protocols/cifs/pom.xml +++ b/protocols/cifs/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/nsclient/pom.xml b/protocols/nsclient/pom.xml index 1a45cd50284b..220d3af5e61a 100644 --- a/protocols/nsclient/pom.xml +++ b/protocols/nsclient/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/pom.xml b/protocols/pom.xml index 55af92770f53..99397ef1cbce 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/radius/pom.xml b/protocols/radius/pom.xml index 7eddb84793ea..023bd196f8b5 100644 --- a/protocols/radius/pom.xml +++ b/protocols/radius/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/selenium-monitor/pom.xml b/protocols/selenium-monitor/pom.xml index 9848356a1078..cdff5df536da 100644 --- a/protocols/selenium-monitor/pom.xml +++ b/protocols/selenium-monitor/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/xml/pom.xml b/protocols/xml/pom.xml index bea8d332d0a4..d2541bb5694e 100644 --- a/protocols/xml/pom.xml +++ b/protocols/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml index d09fe181f7b4..1baf26eabcbc 100644 --- a/smoke-test/pom.xml +++ b/smoke-test/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.opennms smoke-test - 32.0.2 + 32.0.3-SNAPSHOT OpenNMS Smoke Test http://opennms.org/ Smoke Test APIs for OpenNMS diff --git a/tests/dao/pom.xml b/tests/dao/pom.xml index b8e29e6fdf63..181adc6cbc59 100644 --- a/tests/dao/pom.xml +++ b/tests/dao/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/mock-elements/pom.xml b/tests/mock-elements/pom.xml index aba73cc76b7f..cc5adaa0795b 100644 --- a/tests/mock-elements/pom.xml +++ b/tests/mock-elements/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/mock-snmp-agent/pom.xml b/tests/mock-snmp-agent/pom.xml index a6f05324aa48..81efd14ce359 100644 --- a/tests/mock-snmp-agent/pom.xml +++ b/tests/mock-snmp-agent/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/pom.xml b/tests/pom.xml index 8c62b0d0ce23..e80d9a6aeffb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/ui/pom.xml b/ui/pom.xml index 75d424b1b3fd..37737c6683e6 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 32.0.2 + 32.0.3-SNAPSHOT 4.0.0 org.opennms From 0f1612dde444bd4b75d2d251fd2679bbb9327dea Mon Sep 17 00:00:00 2001 From: Mark Mahacek Date: Wed, 9 Aug 2023 12:12:26 -0700 Subject: [PATCH 040/186] NMS-3552: Syslogd doc updates --- .../deep-dive/events/sources/syslog.adoc | 49 ++++++++++++++++--- .../daemons/daemon-config-files/syslogd.adoc | 13 ++++- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc b/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc index ce06e5743801..2b7843c75434 100644 --- a/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc +++ b/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc @@ -16,7 +16,7 @@ You can use parsers to convert syslog message fields into {page-component-title} .Syslog message parsers [options="autowidth"] |=== -| Parser | Description +| Parser | Description | org.opennms.netmgt.syslogd.CustomSyslogParser | Uses a regex statement to parse the syslog header. @@ -49,7 +49,7 @@ Arrange the patterns in the file from most specific to least specific, since the .`RadixTreeSyslogParser` parameter patterns [options="autowidth"] |=== -| Pattern | Description +| Pattern | Description | HOSTNAME | String containing only valid hostname characters (alphanumeric plus '.', '-' and '_'). @@ -81,10 +81,10 @@ Because this matches any character, it must be followed by a delimiter in the pa .`RadixTreeSyslogParser` semantic tokens [cols="1,3"] |=== -| Semantic Token | Description +| Semantic Token | Description | day -| Two-digit day of month (01–31) +| Two-digit day of month (01-31) | facilityPriority | Facility-priority integer @@ -93,7 +93,7 @@ Because this matches any character, it must be followed by a delimiter in the pa | String hostname (unqualified or FQDN), IPv4 address, or IPv6 address. | hour -| Two-digit hour of day (00–23) +| Two-digit hour of day (00-23) | message | Remaining string message. @@ -102,10 +102,10 @@ Because this matches any character, it must be followed by a delimiter in the pa | String message ID | minute -| Two-digit minute (0–59) +| Two-digit minute (0-59) | month -| Two-digit month (01–12) +| Two-digit month (01-12) | parm* | Generic string parameter where the parameter's key is the identifier following "parm" in the semantic token (for example, `parmComponentId` maps to a string parameter with key "ComponentId"). @@ -117,7 +117,7 @@ Because this matches any character, it must be followed by a delimiter in the pa | String process name | second -| Two-digit second (00–59) +| Two-digit second (00-59) | secondFraction | One- to six-digit fractional second value as a string. @@ -131,3 +131,36 @@ Because this matches any character, it must be followed by a delimiter in the pa | year | Four-digit year |=== + +== Examples + +There are some sample syslog event parsing definitions in `$\{OPENNMS_HOME}/etc/syslog` you can use as a base for customizing your own event parsing. + +=== Discarding messages + +If there are syslog messages you do not want to keep, you can set the UEI to `DISCARD-MATCHING-MESSAGES`. +This will flag the message as `donotpersist` so they will be dropped and not written to the database. + +[source, xml] +---- + + + DISCARD-MATCHING-MESSAGES + +---- + +=== Facility/Severity filtering + +If you have similar messages coming in with different syslog facility or severity flags, but only want to capture events that match a specific value, you can specify a filter in the syslogd configuration. + +[source, xml] +---- + + local0 + Warning + + uei.opennms.org/custom/syslog/certExpired + + + +---- diff --git a/docs/modules/reference/pages/daemons/daemon-config-files/syslogd.adoc b/docs/modules/reference/pages/daemons/daemon-config-files/syslogd.adoc index efaf23cd379b..96810f93a2b1 100644 --- a/docs/modules/reference/pages/daemons/daemon-config-files/syslogd.adoc +++ b/docs/modules/reference/pages/daemons/daemon-config-files/syslogd.adoc @@ -18,9 +18,20 @@ Handles processing of xref:operation:deep-dive/events/sources/syslog.adoc[syslog | yes | no -| syslogd/*.xml +| syslog/*.xml | Defines individual mappings between message text and UEIs. Files in this folder must be specified as an include directive in `syslog-configuration.xml`. | yes | no |=== + +.Syslogd log file overview +[options="header"] +[cols="2,3"] +|=== +| File +| Description + +| syslogd.log +| Logs relating to syslog message parsing. +|=== From 94cac1672551dcd9959d465026a569d80fbee202 Mon Sep 17 00:00:00 2001 From: Morteza E <105240903+mershad-manesh@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:13:37 -0400 Subject: [PATCH 041/186] fix spacing --- docs/modules/releasenotes/pages/changelog.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/releasenotes/pages/changelog.adoc b/docs/modules/releasenotes/pages/changelog.adoc index 8a8c15e5926e..5484da9b3ef0 100644 --- a/docs/modules/releasenotes/pages/changelog.adoc +++ b/docs/modules/releasenotes/pages/changelog.adoc @@ -8,6 +8,7 @@ Release 32.0.2 contains several important security fixes, one fix for a potential DOS vulnerability, and a handful of general bugfixes and enhancements. Thanks to the following researchers for responsibly disclosing security issues in this release: + * Moshe Appelbaum reported issue NMS-15699. * Jordi Morales reported issues NMS-15703, NMS-15782, and NMS-15783. * OSS Fuzz reported issue NMS-15877. From d426eff4c279cbbfbdba1318d2d7d69e9a9c9e97 Mon Sep 17 00:00:00 2001 From: mmahacek Date: Wed, 9 Aug 2023 12:51:19 -0700 Subject: [PATCH 042/186] Apply suggestions from code review Co-authored-by: Bonrob2 <59453630+Bonrob2@users.noreply.github.com> --- .../operation/pages/deep-dive/events/sources/syslog.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc b/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc index 2b7843c75434..f0d7447b17bc 100644 --- a/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc +++ b/docs/modules/operation/pages/deep-dive/events/sources/syslog.adoc @@ -136,10 +136,10 @@ Because this matches any character, it must be followed by a delimiter in the pa There are some sample syslog event parsing definitions in `$\{OPENNMS_HOME}/etc/syslog` you can use as a base for customizing your own event parsing. -=== Discarding messages +=== Discard messages If there are syslog messages you do not want to keep, you can set the UEI to `DISCARD-MATCHING-MESSAGES`. -This will flag the message as `donotpersist` so they will be dropped and not written to the database. +This will flag the message as `donotpersist` so it will be dropped and not written to the database. [source, xml] ---- From a190afc0ef9776d1578d3b49cec684789df24fd4 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 15:56:29 -0400 Subject: [PATCH 043/186] use --no-audit to make npm install not fail --- core/web-assets/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/web-assets/package.json b/core/web-assets/package.json index 5ab51835de8e..7a637f4493b0 100644 --- a/core/web-assets/package.json +++ b/core/web-assets/package.json @@ -180,7 +180,7 @@ "webpack": "cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --env=development", "webpack-release": "cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --env=production", "check-git": "node check-git.js", - "install-deps": "npm ci", + "install-deps": "npm --prefer-offline --no-progress --no-audit ci", "build": "npm run check-git && npm run webpack", "build-release": "npm run check-git && npm run webpack-release", "build-verbose": "npm run check-git && npm run lint && cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --debug --colors --display-modules --display-chunks --display-error-details --display-origins --display-reasons --env=development", From 68d51abd61c640ce9290399c7802b7c43dde6650 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 16:52:26 -0400 Subject: [PATCH 044/186] NMS-15806: don't just null-check, also look for empties --- .../apilayer/common/collectors/CollectionSetMapper.java | 2 +- .../netmgt/collection/support/GenericTypeResourceTest.java | 5 ++++- .../kafka/producer/collection/CollectionSetMapper.java | 6 ++++-- .../netmgt/timeseries/samplewrite/MetaTagDataLoader.java | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/features/api-layer/common/src/main/java/org/opennms/features/apilayer/common/collectors/CollectionSetMapper.java b/features/api-layer/common/src/main/java/org/opennms/features/apilayer/common/collectors/CollectionSetMapper.java index fbe13433ea2e..cb62dc2fbb0a 100644 --- a/features/api-layer/common/src/main/java/org/opennms/features/apilayer/common/collectors/CollectionSetMapper.java +++ b/features/api-layer/common/src/main/java/org/opennms/features/apilayer/common/collectors/CollectionSetMapper.java @@ -170,7 +170,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid diff --git a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java index 67f7538e0bcc..8b2029a26036 100644 --- a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java +++ b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java @@ -95,6 +95,9 @@ private String getInstanceInResourcePath(String instance) { // Build the resource path, and extract the instance (the last element of the path) ResourcePath path = gtr.getPath(resource); String[] elements = path.elements(); - return elements[elements.length - 1]; + if (elements != null && elements.length > 0) { + return elements[elements.length - 1]; + } + return null; } } diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java index 31a0647589a4..84fe9703c915 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java @@ -239,7 +239,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid @@ -258,7 +258,9 @@ private CollectionSetProtos.ResponseTimeResource.Builder buildResponseTimeResour // Check if resource parent is an IpAddress. if (resource.getParent() != null && resource.getParent().elements().length == 1) { String[] resourcePathArray = resource.getParent().elements(); - validIp = checkForValidIpAddress(resourcePathArray[0]); + if (resourcePathArray != null && resourcePathArray.length > 0) { + validIp = checkForValidIpAddress(resourcePathArray[0]); + } } if (resource.getPath() != null && validIp) { // extract path which consists of location and IpAddress. diff --git a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java index 305c16bf4f5e..0aaf9d45eec6 100644 --- a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java +++ b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java @@ -149,7 +149,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { final String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid From a038ff72b6ac0d83d6533199ba32b1b38b373b68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:19:44 +0000 Subject: [PATCH 045/186] build(deps): bump org.ops4j.pax.swissbox:pax-swissbox-optional-jcl Bumps [org.ops4j.pax.swissbox:pax-swissbox-optional-jcl](https://github.com/ops4j/org.ops4j.pax.swissbox) from 1.8.0 to 1.8.3. - [Commits](https://github.com/ops4j/org.ops4j.pax.swissbox/compare/swissbox-1.8.0...swissbox-1.8.3) --- updated-dependencies: - dependency-name: org.ops4j.pax.swissbox:pax-swissbox-optional-jcl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- features/vaadin-components/extender-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/vaadin-components/extender-service/pom.xml b/features/vaadin-components/extender-service/pom.xml index 0f7004386a21..a53ea1764122 100644 --- a/features/vaadin-components/extender-service/pom.xml +++ b/features/vaadin-components/extender-service/pom.xml @@ -80,7 +80,7 @@ org.ops4j.pax.swissbox pax-swissbox-optional-jcl - 1.8.0 + 1.8.3 compile true From 00617106c5b94be1d054fff6eff60a4b8dfa36e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:24:22 +0000 Subject: [PATCH 046/186] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- smoke-test/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 943e14223ebf..670f7b8d8962 100644 --- a/pom.xml +++ b/pom.xml @@ -1484,7 +1484,7 @@ 3.1.2 2.10 - 3.4.1 + 3.5.0 1.6.0 3.5.0 2.7.7 diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml index 99f1f0e89da5..d74664fb48ba 100644 --- a/smoke-test/pom.xml +++ b/smoke-test/pom.xml @@ -220,7 +220,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 jar From 0739aaf29c35bb8c9231807cc6b7140d6666c168 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:44:28 +0000 Subject: [PATCH 047/186] build(deps-dev): bump sass from 1.64.2 to 1.65.1 in /core/web-assets Bumps [sass](https://github.com/sass/dart-sass) from 1.64.2 to 1.65.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.64.2...1.65.1) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index cb012f3d0b0a..d631760d59f8 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -18899,9 +18899,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.64.2", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz", - "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==", + "version": "1.65.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz", + "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -36810,9 +36810,9 @@ "dev": true }, "sass": { - "version": "1.64.2", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz", - "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==", + "version": "1.65.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz", + "integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", From f6c845a30d7eaad2ea3a02f23783a9cfc5d96920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:44:51 +0000 Subject: [PATCH 048/186] build(deps-dev): bump @typescript-eslint/parser in /core/web-assets Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.2.1 to 6.3.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.3.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 338 +++++++++++++++++------------- 1 file changed, 190 insertions(+), 148 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index cb012f3d0b0a..aea68be342c2 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -4035,15 +4035,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz", - "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.3.0.tgz", + "integrity": "sha512-ibP+y2Gr6p0qsUkhs7InMdXrwldjxZw66wpcQq9/PzAroM45wdwyu81T+7RibNCh8oc0AgrsyCwJByncY0Ongg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4" }, "engines": { @@ -4062,14 +4062,56 @@ } } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "node_modules/@typescript-eslint/parser/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", + "integrity": "sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", + "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" + "@typescript-eslint/typescript-estree": "6.2.1", + "@typescript-eslint/utils": "6.2.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4077,9 +4119,17 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", @@ -4092,7 +4142,7 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", @@ -4119,7 +4169,7 @@ } } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", @@ -4136,7 +4186,7 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/parser/node_modules/debug": { + "node_modules/@typescript-eslint/type-utils/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", @@ -4153,7 +4203,7 @@ } } }, - "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { + "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", @@ -4165,7 +4215,7 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@typescript-eslint/parser/node_modules/lru-cache": { + "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", @@ -4177,13 +4227,13 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/parser/node_modules/ms": { + "node_modules/@typescript-eslint/type-utils/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "node_modules/@typescript-eslint/parser/node_modules/semver": { + "node_modules/@typescript-eslint/type-utils/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", @@ -4198,43 +4248,16 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/parser/node_modules/yallist": { + "node_modules/@typescript-eslint/type-utils/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", + "node_modules/@typescript-eslint/types": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", + "integrity": "sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4244,14 +4267,14 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.3.0.tgz", + "integrity": "sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4271,24 +4294,7 @@ } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/debug": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", @@ -4305,19 +4311,7 @@ } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", @@ -4329,13 +4323,13 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/ms": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "node_modules/@typescript-eslint/type-utils/node_modules/semver": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", @@ -4350,7 +4344,7 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/yallist": { + "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", @@ -4523,6 +4517,35 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.3.0.tgz", + "integrity": "sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.3.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", + "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@uirouter/core": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz", @@ -25151,28 +25174,57 @@ } }, "@typescript-eslint/parser": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz", - "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.3.0.tgz", + "integrity": "sha512-ibP+y2Gr6p0qsUkhs7InMdXrwldjxZw66wpcQq9/PzAroM45wdwyu81T+7RibNCh8oc0AgrsyCwJByncY0Ongg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4" }, "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" + "ms": "2.1.2" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@typescript-eslint/scope-manager": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", + "integrity": "sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0" + } + }, + "@typescript-eslint/type-utils": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", + "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", + "dev": true, + "requires": { + "@typescript-eslint/typescript-estree": "6.2.1", + "@typescript-eslint/utils": "6.2.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "dependencies": { "@typescript-eslint/types": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", @@ -25251,49 +25303,27 @@ } } }, - "@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", + "@typescript-eslint/types": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", + "integrity": "sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.3.0.tgz", + "integrity": "sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, "dependencies": { - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -25303,12 +25333,6 @@ "ms": "2.1.2" } }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -25444,6 +25468,24 @@ } } }, + "@typescript-eslint/visitor-keys": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.3.0.tgz", + "integrity": "sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.3.0", + "eslint-visitor-keys": "^3.4.1" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", + "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "dev": true + } + } + }, "@uirouter/core": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz", From 88ac1fd203d2c5ca7b9a7802436a7017a4c2abdf Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 10:05:51 -0400 Subject: [PATCH 049/186] NMS-16031: change the wording of the unmatched bean log, and make it a trace Also cleaned up a couple of sonar warnings while I was in the code. --- .../service/DefaultPluginRegistry.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java index 82f949a4da78..89813a90b07d 100644 --- a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java +++ b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2009-2014 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc. + * Copyright (C) 2009-2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -34,6 +34,8 @@ import java.util.Map; import java.util.Set; +import javax.validation.Valid; + import org.opennms.core.soa.ServiceRegistry; import org.opennms.core.spring.BeanUtils; import org.opennms.netmgt.provision.IpInterfacePolicy; @@ -83,14 +85,18 @@ public void afterPropertiesSet() throws Exception { addAllExtensions(m_snmpInterfacePolicies, SnmpInterfacePolicy.class, OnmsPolicy.class); } + private static void trace(String format, Object... args) { + LOG.trace(format, args); + } + private static void debug(String format, Object... args) { LOG.debug(format, args); } - + private static void info(String format, Object... args) { LOG.info(format, args); } - + private static void error(Throwable cause, String format, Object... args) { if (cause == null) { LOG.error(format, args); @@ -118,13 +124,13 @@ public Collection getAllPlugins(Class pluginClass) { /** {@inheritDoc} */ @Override - public T getPluginInstance(Class pluginClass, PluginConfig pluginConfig) { + public T getPluginInstance(Class pluginClass, @Valid PluginConfig pluginConfig) { T pluginInstance = beanWithNameOfType(pluginConfig.getPluginClass(), pluginClass); if (pluginInstance == null) { return null; } - Map parameters = new HashMap(pluginConfig.getParameterMap()); + Map parameters = new HashMap<>(pluginConfig.getParameterMap()); BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(pluginInstance); @@ -155,8 +161,7 @@ private T beanWithNameOfType(String beanName, Class pluginClass) { // if not, the policy definition seems to be broken error(null,"Policy class not found or not a policy class: '{}' of type {}", beanName, pluginClass); } else { - // log only for debug - debug("Failed to find bean {} with name {} of type {}", bean, beanName, pluginClass); + trace("Bean {} with name {} does not match requested type {}", bean, beanName, pluginClass); } } return bean; From c5f740834f12d6aa9cea9b64c5eac59b1eacad5a Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 10:30:44 -0400 Subject: [PATCH 050/186] NMS-16031: clarify policy behavior in the operation manual --- .../pages/deep-dive/provisioning/policies.adoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc index 2301320f192a..eef757684853 100644 --- a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc +++ b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc @@ -13,6 +13,19 @@ Setting this parameter’s value to `ALL_PARAMETERS` causes Provisiond to evalua String values are assumed to be a substring match, unless the parameter is prefixed with `~` to indicate the policy should evaluate as a regular expression. +== Policy types + +There are 3 types of policies: node, IP interface, and SNMP interface. + +=== Node + +Node policies apply to the node as a whole, and are applied during node scans relatively early in the process, potentially before any interfaces are discovered. + +=== IP and SNMP interface + +The interface policies are applied during the node scan, and are intended to filter and update interfaces which are discovered through SNMP. +NOTE: They do _not_ apply to interfaces defined in the requisition. + == Supported policies For information on supported policies and how to configure them, see xref:reference:provisioning/policies.adoc[policies reference section]. \ No newline at end of file From 8beabcbd65901d98870f52c5f278e1e5246e52d5 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 10:36:38 -0400 Subject: [PATCH 051/186] NMS-16031: interface metadata policy only applies to discovered interfaces --- .../modules/reference/pages/provisioning/policies/metadata.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/reference/pages/provisioning/policies/metadata.adoc b/docs/modules/reference/pages/provisioning/policies/metadata.adoc index 8874f7527579..b418c3f474f6 100644 --- a/docs/modules/reference/pages/provisioning/policies/metadata.adoc +++ b/docs/modules/reference/pages/provisioning/policies/metadata.adoc @@ -6,4 +6,4 @@ The Metadata Policy lets you set node-level metadata in the context `requisition == Interface metadata policy -The Metadata Policy lets you set interface-level metadata in the context `requisition` for provisioned nodes. +The Metadata Policy lets you set interface-level metadata in the context `requisition` for discovered interfaces on provisioned nodes. From 9fd65e8970cdf8ddc812e4b88231ebd019b2f22a Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 12:07:16 -0400 Subject: [PATCH 052/186] minor style guide update to policies page Co-authored-by: Bonrob2 <59453630+Bonrob2@users.noreply.github.com> --- .../operation/pages/deep-dive/provisioning/policies.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc index eef757684853..4b7aa515820a 100644 --- a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc +++ b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc @@ -15,7 +15,7 @@ String values are assumed to be a substring match, unless the parameter is prefi == Policy types -There are 3 types of policies: node, IP interface, and SNMP interface. +There are three types of policy: node, IP interface, and SNMP interface. === Node From 087f734fa6fbf4a943c0d8871afd3fd416fd8dec Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 12:07:27 -0400 Subject: [PATCH 053/186] minor style guide update to policies page Co-authored-by: Bonrob2 <59453630+Bonrob2@users.noreply.github.com> --- .../operation/pages/deep-dive/provisioning/policies.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc index 4b7aa515820a..b81a8a509182 100644 --- a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc +++ b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc @@ -23,7 +23,7 @@ Node policies apply to the node as a whole, and are applied during node scans re === IP and SNMP interface -The interface policies are applied during the node scan, and are intended to filter and update interfaces which are discovered through SNMP. +The interface policies are applied during the node scan, and are intended to filter and update interfaces that are discovered through SNMP. NOTE: They do _not_ apply to interfaces defined in the requisition. == Supported policies From eb2c907eea0e377b53dd6470f31b481152768442 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 10 Aug 2023 12:07:38 -0400 Subject: [PATCH 054/186] minor style guide update to policies page Co-authored-by: Bonrob2 <59453630+Bonrob2@users.noreply.github.com> --- .../operation/pages/deep-dive/provisioning/policies.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc index b81a8a509182..eb6f786e8639 100644 --- a/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc +++ b/docs/modules/operation/pages/deep-dive/provisioning/policies.adoc @@ -24,7 +24,7 @@ Node policies apply to the node as a whole, and are applied during node scans re === IP and SNMP interface The interface policies are applied during the node scan, and are intended to filter and update interfaces that are discovered through SNMP. -NOTE: They do _not_ apply to interfaces defined in the requisition. +NOTE: They do not apply to interfaces defined in the requisition. == Supported policies From b3d34aeafc76559a3a7f92b36907dd95bc1303a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:55:41 +0000 Subject: [PATCH 055/186] build(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.2.1 to 6.3.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.3.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 497 +++--------------------------- 1 file changed, 36 insertions(+), 461 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index b152a628ad13..ff00dfcdc41e 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -3884,16 +3884,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz", - "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.3.0.tgz", + "integrity": "sha512-IZYjYZ0ifGSLZbwMqIip/nOamFiWJ9AH+T/GYNZBWkVcyNQOFGtSMoWV7RvY4poYCMZ/4lHzNl796WOSNxmk8A==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/type-utils": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/type-utils": "6.3.0", + "@typescript-eslint/utils": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -3919,53 +3919,6 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -3983,18 +3936,6 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4103,13 +4044,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.3.0.tgz", + "integrity": "sha512-7Oj+1ox1T2Yc8PKpBvOKWhoI/4rWFd1j7FA/rPE0lbBPXTKjdbtC+7Ev0SeBjEKkIhKWVeZSP+mR7y1Db1CdfQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/utils": "6.3.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -4129,63 +4070,6 @@ } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/type-utils/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4203,57 +4087,12 @@ } } }, - "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@typescript-eslint/type-utils/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "node_modules/@typescript-eslint/type-utils/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/types": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", @@ -4351,17 +4190,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.3.0.tgz", + "integrity": "sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", "semver": "^7.5.4" }, "engines": { @@ -4375,109 +4214,6 @@ "eslint": "^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4490,12 +4226,6 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/utils/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/@typescript-eslint/utils/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -25081,16 +24811,16 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz", - "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.3.0.tgz", + "integrity": "sha512-IZYjYZ0ifGSLZbwMqIip/nOamFiWJ9AH+T/GYNZBWkVcyNQOFGtSMoWV7RvY4poYCMZ/4lHzNl796WOSNxmk8A==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/type-utils": "6.2.1", - "@typescript-eslint/utils": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/type-utils": "6.3.0", + "@typescript-eslint/utils": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -25100,32 +24830,6 @@ "ts-api-utils": "^1.0.1" }, "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - } - }, - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -25135,12 +24839,6 @@ "ms": "2.1.2" } }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -25214,48 +24912,17 @@ } }, "@typescript-eslint/type-utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz", - "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.3.0.tgz", + "integrity": "sha512-7Oj+1ox1T2Yc8PKpBvOKWhoI/4rWFd1j7FA/rPE0lbBPXTKjdbtC+7Ev0SeBjEKkIhKWVeZSP+mR7y1Db1CdfQ==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.2.1", - "@typescript-eslint/utils": "6.2.1", + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/utils": "6.3.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, "dependencies": { - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -25265,41 +24932,11 @@ "ms": "2.1.2" } }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true } } }, @@ -25366,76 +25003,20 @@ } }, "@typescript-eslint/utils": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz", - "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.3.0.tgz", + "integrity": "sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.2.1", - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/typescript-estree": "6.2.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", "semver": "^7.5.4" }, "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz", - "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1" - } - }, - "@typescript-eslint/types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz", - "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz", - "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "@typescript-eslint/visitor-keys": "6.2.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz", - "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.2.1", - "eslint-visitor-keys": "^3.4.1" - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -25445,12 +25026,6 @@ "yallist": "^4.0.0" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", From efc84624115263cc2b14b76872a7e96bb467984d Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 16:52:26 -0400 Subject: [PATCH 056/186] NMS-15806: don't just null-check, also look for empties --- .../features/apilayer/collectors/CollectionSetMapper.java | 2 +- .../netmgt/collection/support/GenericTypeResourceTest.java | 5 ++++- .../kafka/producer/collection/CollectionSetMapper.java | 6 ++++-- .../netmgt/timeseries/samplewrite/MetaTagDataLoader.java | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java index 781953602f92..1aa3596084e5 100644 --- a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java +++ b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java @@ -170,7 +170,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid diff --git a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java index 67f7538e0bcc..8b2029a26036 100644 --- a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java +++ b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java @@ -95,6 +95,9 @@ private String getInstanceInResourcePath(String instance) { // Build the resource path, and extract the instance (the last element of the path) ResourcePath path = gtr.getPath(resource); String[] elements = path.elements(); - return elements[elements.length - 1]; + if (elements != null && elements.length > 0) { + return elements[elements.length - 1]; + } + return null; } } diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java index aba84cc2ae2d..f9d7ac3d986c 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java @@ -233,7 +233,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid @@ -252,7 +252,9 @@ private CollectionSetProtos.ResponseTimeResource.Builder buildResponseTimeResour // Check if resource parent is an IpAddress. if (resource.getParent() != null && resource.getParent().elements().length == 1) { String[] resourcePathArray = resource.getParent().elements(); - validIp = checkForValidIpAddress(resourcePathArray[0]); + if (resourcePathArray != null && resourcePathArray.length > 0) { + validIp = checkForValidIpAddress(resourcePathArray[0]); + } } if (resource.getPath() != null && validIp) { // extract path which consists of location and IpAddress. diff --git a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java index 065d75535893..cf4025b64636 100644 --- a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java +++ b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java @@ -149,7 +149,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { final String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid From 37b2f78c8d07908e5877fcf705bc47180cb3654e Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 16:52:26 -0400 Subject: [PATCH 057/186] NMS-15806: don't just null-check, also look for empties --- .../features/apilayer/collectors/CollectionSetMapper.java | 2 +- .../netmgt/collection/support/GenericTypeResourceTest.java | 5 ++++- .../kafka/producer/collection/CollectionSetMapper.java | 6 ++++-- .../netmgt/timeseries/samplewrite/MetaTagDataLoader.java | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java index 781953602f92..1aa3596084e5 100644 --- a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java +++ b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java @@ -170,7 +170,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid diff --git a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java index 5410b173e1ed..2905925e2470 100644 --- a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java +++ b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java @@ -96,6 +96,9 @@ private String getInstanceInResourcePath(String instance) { // Build the resource path, and extract the instance (the last element of the path) ResourcePath path = gtr.getPath(resource); String[] elements = path.elements(); - return elements[elements.length - 1]; + if (elements != null && elements.length > 0) { + return elements[elements.length - 1]; + } + return null; } } diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java index 87d94b2f9a56..f21cbd8d3b18 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java @@ -197,7 +197,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid @@ -216,7 +216,9 @@ private CollectionSetProtos.ResponseTimeResource.Builder buildResponseTimeResour // Check if resource parent is an IpAddress. if (resource.getParent() != null && resource.getParent().elements().length == 1) { String[] resourcePathArray = resource.getParent().elements(); - validIp = checkForValidIpAddress(resourcePathArray[0]); + if (resourcePathArray != null && resourcePathArray.length > 0) { + validIp = checkForValidIpAddress(resourcePathArray[0]); + } } if (resource.getPath() != null && validIp) { // extract path which consists of location and IpAddress. diff --git a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java index 63ab870fec3f..7d1d5e8f68b5 100644 --- a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java +++ b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java @@ -146,7 +146,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { final String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid From 0060cef643d7b9e0b91c449622c6255acdf497f7 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 9 Aug 2023 16:52:26 -0400 Subject: [PATCH 058/186] NMS-15806: don't just null-check, also look for empties --- .../features/apilayer/collectors/CollectionSetMapper.java | 2 +- .../netmgt/collection/support/GenericTypeResourceTest.java | 5 ++++- .../kafka/producer/collection/CollectionSetMapper.java | 6 ++++-- .../netmgt/timeseries/samplewrite/MetaTagDataLoader.java | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java index 781953602f92..1aa3596084e5 100644 --- a/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java +++ b/features/api-layer/src/main/java/org/opennms/features/apilayer/collectors/CollectionSetMapper.java @@ -170,7 +170,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid diff --git a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java index 5410b173e1ed..2905925e2470 100644 --- a/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java +++ b/features/collection/api/src/test/java/org/opennms/netmgt/collection/support/GenericTypeResourceTest.java @@ -96,6 +96,9 @@ private String getInstanceInResourcePath(String instance) { // Build the resource path, and extract the instance (the last element of the path) ResourcePath path = gtr.getPath(resource); String[] elements = path.elements(); - return elements[elements.length - 1]; + if (elements != null && elements.length > 0) { + return elements[elements.length - 1]; + } + return null; } } diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java index 87d94b2f9a56..f21cbd8d3b18 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/collection/CollectionSetMapper.java @@ -197,7 +197,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid @@ -216,7 +216,9 @@ private CollectionSetProtos.ResponseTimeResource.Builder buildResponseTimeResour // Check if resource parent is an IpAddress. if (resource.getParent() != null && resource.getParent().elements().length == 1) { String[] resourcePathArray = resource.getParent().elements(); - validIp = checkForValidIpAddress(resourcePathArray[0]); + if (resourcePathArray != null && resourcePathArray.length > 0) { + validIp = checkForValidIpAddress(resourcePathArray[0]); + } } if (resource.getPath() != null && validIp) { // extract path which consists of location and IpAddress. diff --git a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java index 63ab870fec3f..7d1d5e8f68b5 100644 --- a/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java +++ b/features/timeseries/src/main/java/org/opennms/netmgt/timeseries/samplewrite/MetaTagDataLoader.java @@ -146,7 +146,7 @@ private String getNodeCriteriaFromResource(CollectionResource resource) { String nodeCriteria = null; if (resource.getParent() != null) { final String[] resourcePathArray = resource.getParent().elements(); - if (resourcePathArray != null) { + if (resourcePathArray != null && resourcePathArray.length > 0) { if (ResourceTypeUtils.FOREIGN_SOURCE_DIRECTORY.equals(resourcePathArray[0]) && resourcePathArray.length == 3) { // parent denotes nodeCriteria, form fs:fid From 7a35fae26b5dde39d57705c5acd583195ec7c7ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:34:40 +0000 Subject: [PATCH 059/186] build(deps-dev): bump eslint from 8.46.0 to 8.47.0 in /core/web-assets Bumps [eslint](https://github.com/eslint/eslint) from 8.46.0 to 8.47.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.46.0...v8.47.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 84 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index ff00dfcdc41e..dd383b7bd78b 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -2206,9 +2206,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz", - "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -2262,9 +2262,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2332,9 +2332,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz", - "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -8612,15 +8612,15 @@ } }, "node_modules/eslint": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz", - "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.1", - "@eslint/js": "^8.46.0", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -8631,7 +8631,7 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.2", + "eslint-visitor-keys": "^3.4.3", "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", @@ -8965,9 +8965,9 @@ } }, "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -9238,9 +9238,9 @@ } }, "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -23509,9 +23509,9 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz", - "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -23551,9 +23551,9 @@ } }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -23602,9 +23602,9 @@ } }, "@eslint/js": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz", - "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true }, "@gar/promisify": { @@ -28640,15 +28640,15 @@ } }, "eslint": { - "version": "8.46.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz", - "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.1", - "@eslint/js": "^8.46.0", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -28659,7 +28659,7 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.2", + "eslint-visitor-keys": "^3.4.3", "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", @@ -28767,9 +28767,9 @@ "dev": true }, "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true }, "find-up": { @@ -29081,9 +29081,9 @@ }, "dependencies": { "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true } } From 1f8eaee687f0c8d98ae7e1c1189c9ef644fd4f34 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 14 Aug 2023 10:19:13 -0400 Subject: [PATCH 060/186] NMS-16031: clarify wording a bit as per feedback --- .../opennms/netmgt/provision/service/DefaultPluginRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java index 89813a90b07d..9d1b6e9f1a4b 100644 --- a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java +++ b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultPluginRegistry.java @@ -161,7 +161,7 @@ private T beanWithNameOfType(String beanName, Class pluginClass) { // if not, the policy definition seems to be broken error(null,"Policy class not found or not a policy class: '{}' of type {}", beanName, pluginClass); } else { - trace("Bean {} with name {} does not match requested type {}", bean, beanName, pluginClass); + trace("Bean {} with name {} is a policy, but does not match requested type {}", bean, beanName, pluginClass); } } return bean; From 3c5c84a3f9019b2dfb315d34be1ce2da4e098e5f Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 14 Aug 2023 11:06:42 -0400 Subject: [PATCH 061/186] fix some weird transient dependency stuff going on with jest in smoke tests --- features/flows/api/pom.xml | 4 ++-- smoke-test/pom.xml | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/features/flows/api/pom.xml b/features/flows/api/pom.xml index de0c4301b374..9753371dc85d 100644 --- a/features/flows/api/pom.xml +++ b/features/flows/api/pom.xml @@ -43,8 +43,8 @@ io.searchbox - jest-common - 5.3.3 + jest-complete-osgi + ${jestVersion} compile diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml index 99f1f0e89da5..38009fd36712 100644 --- a/smoke-test/pom.xml +++ b/smoke-test/pom.xml @@ -53,6 +53,7 @@ 0.0.29 2.14.2 2.40 + 5.3.4 5.9.2 4.3.6 4.6.0 @@ -685,6 +686,24 @@ org.opennms.features.jest org.opennms.features.jest.client ${project.version} + + + + io.searchbox + * + + + + + io.searchbox + jest + ${jestVersion} + + + io.searchbox + jest-common + ${jestVersion} org.apache.httpcomponents @@ -888,6 +907,12 @@ org.opennms.features.flows org.opennms.features.flows.elastic ${project.version} + + + io.searchbox + * + + org.opennms.features.flows From 0703137052044de892603005dd35596ed5bb9764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:30:47 +0000 Subject: [PATCH 062/186] build(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 511 +++++++++++++++++++++++++++--- 1 file changed, 461 insertions(+), 50 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index dd383b7bd78b..16951e006f22 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -3884,21 +3884,20 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.3.0.tgz", - "integrity": "sha512-IZYjYZ0ifGSLZbwMqIip/nOamFiWJ9AH+T/GYNZBWkVcyNQOFGtSMoWV7RvY4poYCMZ/4lHzNl796WOSNxmk8A==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz", + "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/type-utils": "6.3.0", - "@typescript-eslint/utils": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/type-utils": "6.4.0", + "@typescript-eslint/utils": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", "natural-compare": "^1.4.0", - "natural-compare-lite": "^1.4.0", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, @@ -3919,6 +3918,53 @@ } } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -3936,6 +3982,18 @@ } } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4044,13 +4102,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.3.0.tgz", - "integrity": "sha512-7Oj+1ox1T2Yc8PKpBvOKWhoI/4rWFd1j7FA/rPE0lbBPXTKjdbtC+7Ev0SeBjEKkIhKWVeZSP+mR7y1Db1CdfQ==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", + "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.3.0", - "@typescript-eslint/utils": "6.3.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/utils": "6.4.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -4070,6 +4128,63 @@ } } }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@typescript-eslint/type-utils/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4087,12 +4202,57 @@ } } }, + "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/type-utils/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/@typescript-eslint/type-utils/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/types": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", @@ -4190,17 +4350,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.3.0.tgz", - "integrity": "sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", + "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", "semver": "^7.5.4" }, "engines": { @@ -4214,6 +4374,109 @@ "eslint": "^7.0.0 || ^8.0.0" } }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4226,6 +4489,12 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/utils/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "node_modules/@typescript-eslint/utils/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -16223,12 +16492,6 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", @@ -24811,25 +25074,50 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.3.0.tgz", - "integrity": "sha512-IZYjYZ0ifGSLZbwMqIip/nOamFiWJ9AH+T/GYNZBWkVcyNQOFGtSMoWV7RvY4poYCMZ/4lHzNl796WOSNxmk8A==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz", + "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/type-utils": "6.3.0", - "@typescript-eslint/utils": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/type-utils": "6.4.0", + "@typescript-eslint/utils": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", "natural-compare": "^1.4.0", - "natural-compare-lite": "^1.4.0", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + } + }, + "@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true + }, + "@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -24839,6 +25127,12 @@ "ms": "2.1.2" } }, + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -24912,17 +25206,48 @@ } }, "@typescript-eslint/type-utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.3.0.tgz", - "integrity": "sha512-7Oj+1ox1T2Yc8PKpBvOKWhoI/4rWFd1j7FA/rPE0lbBPXTKjdbtC+7Ev0SeBjEKkIhKWVeZSP+mR7y1Db1CdfQ==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", + "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "6.3.0", - "@typescript-eslint/utils": "6.3.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/utils": "6.4.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, "dependencies": { + "@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -24932,11 +25257,41 @@ "ms": "2.1.2" } }, + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -25003,20 +25358,76 @@ } }, "@typescript-eslint/utils": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.3.0.tgz", - "integrity": "sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", + "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", "semver": "^7.5.4" }, "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + } + }, + "@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + } + }, + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -25026,6 +25437,12 @@ "yallist": "^4.0.0" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -34433,12 +34850,6 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", From 5ced3a7aa1300394d34cfdf1d0ccbd07f2decc76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:31:37 +0000 Subject: [PATCH 063/186] build(deps): bump cron-parser from 4.8.1 to 4.9.0 in /core/web-assets Bumps [cron-parser](https://github.com/harrisiirak/cron-parser) from 4.8.1 to 4.9.0. - [Release notes](https://github.com/harrisiirak/cron-parser/releases) - [Commits](https://github.com/harrisiirak/cron-parser/compare/4.8.1...4.9.0) --- updated-dependencies: - dependency-name: cron-parser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index dd383b7bd78b..d16be15ba7fa 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -7576,9 +7576,9 @@ } }, "node_modules/cron-parser": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.1.tgz", - "integrity": "sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", "dependencies": { "luxon": "^3.2.1" }, @@ -27813,9 +27813,9 @@ } }, "cron-parser": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.1.tgz", - "integrity": "sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", "requires": { "luxon": "^3.2.1" } From d38896eb59d0af064d4f83624c5403eace716646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:32:01 +0000 Subject: [PATCH 064/186] build(deps-dev): bump @typescript-eslint/parser in /core/web-assets Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 218 ++++++++++++++++++++++++++++-- 1 file changed, 204 insertions(+), 14 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index dd383b7bd78b..26644491c06d 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -3976,15 +3976,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.3.0.tgz", - "integrity": "sha512-ibP+y2Gr6p0qsUkhs7InMdXrwldjxZw66wpcQq9/PzAroM45wdwyu81T+7RibNCh8oc0AgrsyCwJByncY0Ongg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz", + "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/typescript-estree": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4" }, "engines": { @@ -4003,6 +4003,80 @@ } } }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@typescript-eslint/parser/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4020,12 +4094,57 @@ } } }, + "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/parser/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/@typescript-eslint/parser/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/scope-manager": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", @@ -24872,18 +24991,59 @@ } }, "@typescript-eslint/parser": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.3.0.tgz", - "integrity": "sha512-ibP+y2Gr6p0qsUkhs7InMdXrwldjxZw66wpcQq9/PzAroM45wdwyu81T+7RibNCh8oc0AgrsyCwJByncY0Ongg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz", + "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "6.3.0", - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/typescript-estree": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4" }, "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" + } + }, + "@typescript-eslint/types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -24893,11 +25053,41 @@ "ms": "2.1.2" } }, + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, From bb8e59138a6d96965878d5003a259c9b0e94383b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:32:19 +0000 Subject: [PATCH 065/186] build(deps-dev): bump @rangerrick/moment-javaformat in /core/web-assets Bumps [@rangerrick/moment-javaformat](https://github.com/RangerRick/moment-javaformat) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/RangerRick/moment-javaformat/releases) - [Changelog](https://github.com/RangerRick/moment-javaformat/blob/v2.0.5/CHANGELOG.md) - [Commits](https://github.com/RangerRick/moment-javaformat/compare/v2.0.4...v2.0.5) --- updated-dependencies: - dependency-name: "@rangerrick/moment-javaformat" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index dd383b7bd78b..e6848cfc715b 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -3674,9 +3674,9 @@ } }, "node_modules/@rangerrick/moment-javaformat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@rangerrick/moment-javaformat/-/moment-javaformat-2.0.4.tgz", - "integrity": "sha512-tki0wzlURalF7FX8UaWBSsVLTP04fqF3y8zBJbESurDY6xHsRMvU6Ug0n+EVNzFztUR6HeaoP8hezMbqkqIFQA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@rangerrick/moment-javaformat/-/moment-javaformat-2.0.5.tgz", + "integrity": "sha512-tH1aGc0EbN1+oU/OOBgZs1Wmprb1pKrLpu3RTKIsuB1mF+3+Zgl2ggjlt6FzzLdxk6fy8JAv8fSvbiILUh3ryw==", "dev": true, "peerDependencies": { "moment-timezone": "^0.x" @@ -24606,9 +24606,9 @@ "peer": true }, "@rangerrick/moment-javaformat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@rangerrick/moment-javaformat/-/moment-javaformat-2.0.4.tgz", - "integrity": "sha512-tki0wzlURalF7FX8UaWBSsVLTP04fqF3y8zBJbESurDY6xHsRMvU6Ug0n+EVNzFztUR6HeaoP8hezMbqkqIFQA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@rangerrick/moment-javaformat/-/moment-javaformat-2.0.5.tgz", + "integrity": "sha512-tH1aGc0EbN1+oU/OOBgZs1Wmprb1pKrLpu3RTKIsuB1mF+3+Zgl2ggjlt6FzzLdxk6fy8JAv8fSvbiILUh3ryw==", "dev": true, "requires": {} }, From 9160b8bbb30fbefe9f48c78ecb7fa62211442525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:41:18 +0000 Subject: [PATCH 066/186] build(deps): bump joda-time:joda-time from 2.1 to 2.12.5 Bumps [joda-time:joda-time](https://github.com/JodaOrg/joda-time) from 2.1 to 2.12.5. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.1...v2.12.5) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- features/flows/itests/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/flows/itests/pom.xml b/features/flows/itests/pom.xml index 9bd37a91db17..94b2b057fb96 100644 --- a/features/flows/itests/pom.xml +++ b/features/flows/itests/pom.xml @@ -82,7 +82,7 @@ joda-time joda-time - 2.10.5 + 2.12.5 diff --git a/pom.xml b/pom.xml index 670f7b8d8962..49c45703cb55 100644 --- a/pom.xml +++ b/pom.xml @@ -1676,7 +1676,7 @@ 1.36 1.0_01-ea 5.12.1 - 2.1 + 2.12.5 1.7.2 1.6.5 1.1.0 From 78a6616f3b0355104bb03c7a9b925c121c24636b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:57:43 +0000 Subject: [PATCH 067/186] build(deps): bump org.apache.felix:org.apache.felix.http.bridge Bumps org.apache.felix:org.apache.felix.http.bridge from 4.0.4 to 4.2.10. --- updated-dependencies: - dependency-name: org.apache.felix:org.apache.felix.http.bridge dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 670f7b8d8962..6069ed8ff271 100644 --- a/pom.xml +++ b/pom.xml @@ -1619,7 +1619,7 @@ 4.1.69.Final 7.6.2 1.9.22 - 4.0.4 + 4.2.10 3.0.4 2.8 2.3.32 From 8d99972999760a8d17cf41026cd2d823be5efdc1 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 15 Aug 2023 10:07:15 -0400 Subject: [PATCH 068/186] fix missing dependency (????) --- features/flows/processing/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/features/flows/processing/pom.xml b/features/flows/processing/pom.xml index 7e53218d9dec..a1ad1170c857 100644 --- a/features/flows/processing/pom.xml +++ b/features/flows/processing/pom.xml @@ -42,6 +42,11 @@ com.google.guava guava + + com.google.code.gson + gson + ${gsonVersion} + org.opennms.features.flows org.opennms.features.flows.api From bc4fc782510ab69d895baf9b2627f761acd7d497 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 15 Aug 2023 11:21:23 -0400 Subject: [PATCH 069/186] move to latest 4.0 instead --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6069ed8ff271..993ad9843193 100644 --- a/pom.xml +++ b/pom.xml @@ -1619,7 +1619,7 @@ 4.1.69.Final 7.6.2 1.9.22 - 4.2.10 + 4.0.12 3.0.4 2.8 2.3.32 From 8e5d68900528309cbe8aab5a90ad2814c44be0d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:36:08 +0000 Subject: [PATCH 070/186] build(deps-dev): bump prettier from 3.0.1 to 3.0.2 in /core/web-assets Bumps [prettier](https://github.com/prettier/prettier) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.0.1...3.0.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/web-assets/package-lock.json | 244 +----------------------------- 1 file changed, 6 insertions(+), 238 deletions(-) diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json index de3251e9cac2..5080e117b5c6 100644 --- a/core/web-assets/package-lock.json +++ b/core/web-assets/package-lock.json @@ -4203,23 +4203,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", - "integrity": "sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/type-utils": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", @@ -4372,102 +4355,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/@typescript-eslint/types": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", - "integrity": "sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.3.0.tgz", - "integrity": "sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/utils": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", @@ -4635,35 +4522,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.3.0.tgz", - "integrity": "sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.3.0", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@uirouter/core": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz", @@ -18327,9 +18185,9 @@ } }, "node_modules/prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", + "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -25385,16 +25243,6 @@ } } }, - "@typescript-eslint/scope-manager": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", - "integrity": "sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0" - } - }, "@typescript-eslint/type-utils": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", @@ -25485,68 +25333,6 @@ } } }, - "@typescript-eslint/types": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", - "integrity": "sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.3.0.tgz", - "integrity": "sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.3.0", - "@typescript-eslint/visitor-keys": "6.3.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, "@typescript-eslint/utils": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", @@ -25650,24 +25436,6 @@ } } }, - "@typescript-eslint/visitor-keys": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.3.0.tgz", - "integrity": "sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "6.3.0", - "eslint-visitor-keys": "^3.4.1" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", - "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", - "dev": true - } - } - }, "@uirouter/core": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz", @@ -36473,9 +36241,9 @@ "dev": true }, "prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", + "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", "dev": true }, "pretty-format": { From 9bca0cefa790057b13e44ed1c8bd670e8a8c1723 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:53:29 +0000 Subject: [PATCH 071/186] build(deps): bump jiraClientVersion from 5.2.2 to 5.2.6 Bumps `jiraClientVersion` from 5.2.2 to 5.2.6. Updates `com.atlassian.jira:jira-rest-java-client-api` from 5.2.2 to 5.2.6 - [Commits](https://bitbucket.org/atlassian/jira-rest-java-client/branches/compare/jira-rest-java-client-parent-5.2.6..jira-rest-java-client-parent-5.2.2) Updates `com.atlassian.jira:jira-rest-java-client-core` from 5.2.2 to 5.2.6 - [Commits](https://bitbucket.org/atlassian/jira-rest-java-client/branches/compare/jira-rest-java-client-parent-5.2.6..jira-rest-java-client-parent-5.2.2) --- updated-dependencies: - dependency-name: com.atlassian.jira:jira-rest-java-client-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.atlassian.jira:jira-rest-java-client-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- features/ticketing/jira-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/ticketing/jira-client/pom.xml b/features/ticketing/jira-client/pom.xml index 604789dae085..93b088734a04 100644 --- a/features/ticketing/jira-client/pom.xml +++ b/features/ticketing/jira-client/pom.xml @@ -12,7 +12,7 @@ OSGi wrapper for the Jira Client API. - 5.2.2 + 5.2.6 From 4032a5e76a98cad1660cdf34c2f9b55916f1a7fd Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Mon, 17 Jul 2023 20:08:22 +0200 Subject: [PATCH 072/186] NMS-15504: Prevent angular expr eval without app Do not spawn a default app when there is no real app end prevent evaluation of angular expressions if no app is defined. --- .../templates/schedule-editor.tpl.html | 4 ++-- .../src/main/webapp/admin/snmpInterfaces.jsp | 2 +- opennms-webapp/src/main/webapp/element/node.jsp | 2 +- opennms-webapp/src/main/webapp/includes/bootstrap.jsp | 11 ++++++++--- .../src/main/webapp/includes/search-box.jsp | 2 +- opennms-webapp/src/main/webapp/locations/index.jsp | 1 + opennms-webapp/src/main/webapp/minion/index.jsp | 1 + opennms-webapp/src/main/webapp/report/index.jsp | 1 + opennms-webapp/src/main/webapp/status/index.jsp | 1 + 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core/web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html b/core/web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html index 47845ed34d24..89694632c528 100644 --- a/core/web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html +++ b/core/web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html @@ -62,7 +62,7 @@ -
+
@@ -95,7 +95,7 @@
-
+
diff --git a/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp b/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp index ecd7146f4f2d..915d92c24209 100644 --- a/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp +++ b/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp @@ -80,7 +80,7 @@ Node Label: <%=nodeLabel%>

-

+
diff --git a/opennms-webapp/src/main/webapp/element/node.jsp b/opennms-webapp/src/main/webapp/element/node.jsp index df4bb06566e1..0835da7f056a 100644 --- a/opennms-webapp/src/main/webapp/element/node.jsp +++ b/opennms-webapp/src/main/webapp/element/node.jsp @@ -535,7 +535,7 @@ function confirmAssetEdit() { -
+
Node Interfaces
diff --git a/opennms-webapp/src/main/webapp/includes/bootstrap.jsp b/opennms-webapp/src/main/webapp/includes/bootstrap.jsp index 1685fbc86147..7154420d6576 100644 --- a/opennms-webapp/src/main/webapp/includes/bootstrap.jsp +++ b/opennms-webapp/src/main/webapp/includes/bootstrap.jsp @@ -208,9 +208,14 @@ footer), so we hide it in a JSP code fragment so the Eclipse HTML validator doesn't complain. --%> <%= " - - ng-app="${param.ngapp}" - + + + ng-app="${param.ngapp}" + + + ng-non-bindable + + data-spy="scroll" data-target="${param.scrollSpy}" diff --git a/opennms-webapp/src/main/webapp/includes/search-box.jsp b/opennms-webapp/src/main/webapp/includes/search-box.jsp index 1d96610de383..d3c1e33bc53b 100644 --- a/opennms-webapp/src/main/webapp/includes/search-box.jsp +++ b/opennms-webapp/src/main/webapp/includes/search-box.jsp @@ -3,7 +3,7 @@ session="true" %> -