Merge remote-tracking branch 'horizon/release-26.0.1' into master-26

OpenNMS · Apr 28, 2020 · 49d88dc · 49d88dc
2 parents 2eda00a + 04c4f02
commit 49d88dc
Show file tree

Hide file tree

Showing 794 changed files with 895 additions and 856 deletions.
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms</groupId>
   <artifactId>org.opennms.checkstyle</artifactId>
-  <version>26.0.0</version>
+  <version>26.0.1</version>
   <name>OpenNMS :: Checkstyle</name>
   <build>
     <plugins>

diff --git a/container/branding/pom.xml b/container/branding/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.container</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/container/bridge/api/pom.xml b/container/bridge/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.api</artifactId>

diff --git a/container/bridge/pom.xml b/container/bridge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <groupId>org.opennms.container</groupId>
     <artifactId>org.opennms.container.bridge</artifactId>

diff --git a/container/bridge/proxy/pom.xml b/container/bridge/proxy/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.proxy</artifactId>

diff --git a/container/bridge/rest/pom.xml b/container/bridge/rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.container</groupId>
         <artifactId>org.opennms.container.bridge</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <groupId>org.opennms.container.bridge</groupId>
     <artifactId>org.opennms.container.bridge.rest</artifactId>

diff --git a/container/extender/pom.xml b/container/extender/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.container</groupId>

diff --git a/container/features/pom.xml b/container/features/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.container</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.karaf</groupId>

diff --git a/container/jaas-login-module/pom.xml b/container/jaas-login-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/container/karaf/pom.xml b/container/karaf/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.container</groupId>

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
@@ -63,9 +63,9 @@ log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
 log4j2.logger.opennmsTopology.name = org.opennms.features.topology
 log4j2.logger.opennmsTopology.level = WARN
 
-# 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
 
@@ -110,7 +110,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/pom.xml b/container/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>opennms</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.opennms.container</artifactId>

diff --git a/container/servlet/pom.xml b/container/servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/container/shared/pom.xml b/container/shared/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.container</groupId>

diff --git a/container/spring-extender/pom.xml b/container/spring-extender/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.container</groupId>

diff --git a/container/web/pom.xml b/container/web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.container</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
 
     <groupId>org.opennms.container</groupId>

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/build/keystore/pom.xml b/core/build/keystore/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms.core</groupId>
     <artifactId>org.opennms.core.build</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core.build</groupId>

diff --git a/core/build/pom.xml b/core/build/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/cache/pom.xml b/core/cache/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.core</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core</groupId>

diff --git a/core/camel/pom.xml b/core/camel/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/cli/pom.xml b/core/cli/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/config/pom.xml b/core/config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opennms</groupId>
 		<artifactId>org.opennms.core</artifactId>
-		<version>26.0.0</version>
+		<version>26.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opennms.core</groupId>

diff --git a/core/criteria/pom.xml b/core/criteria/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/daemon/pom.xml b/core/daemon/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/daemon/src/main/resources/META-INF/opennms/applicationContext-daemon.xml b/core/daemon/src/main/resources/META-INF/opennms/applicationContext-daemon.xml
@@ -36,8 +36,6 @@
     <property name="brokerURL" value="#{T(java.lang.System).getProperty('org.opennms.activemq.broker.url', 'vm://localhost?create=false&amp;jms.useAsyncSend=true')}" />
     <property name="userName" value="#{T(java.lang.System).getProperty('org.opennms.activemq.broker.username', '')}" />
     <property name="password" value="#{T(java.lang.System).getProperty('org.opennms.activemq.broker.password', '')}" />
-    <!-- TODO: Remove this parameter after we stop using serialized object messages -->
-    <property name="trustAllPackages" value="true"/>
   </bean>
 
   <bean id="pooledConnectionFactory" class="org.opennms.features.activemq.PooledConnectionFactory"

diff --git a/core/db-install/pom.xml b/core/db-install/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/db/pom.xml b/core/db/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/health/api/pom.xml b/core/health/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.core</groupId>
         <artifactId>org.opennms.core.health</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core.health</groupId>

diff --git a/core/health/impl/pom.xml b/core/health/impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.core</groupId>
         <artifactId>org.opennms.core.health</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core.health</groupId>

diff --git a/core/health/pom.xml b/core/health/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms</groupId>
         <artifactId>org.opennms.core</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core</groupId>

diff --git a/core/health/rest/pom.xml b/core/health/rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.core</groupId>
         <artifactId>org.opennms.core.health</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core.health</groupId>

diff --git a/core/health/shell/pom.xml b/core/health/shell/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opennms.core</groupId>
         <artifactId>org.opennms.core.health</artifactId>
-        <version>26.0.0</version>
+        <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core.health</groupId>

diff --git a/core/icmp-jna/pom.xml b/core/icmp-jna/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms</groupId>
     <artifactId>org.opennms.core</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core</groupId>

diff --git a/core/ipc/common/aws-sqs/pom.xml b/core/ipc/common/aws-sqs/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms.core.ipc</groupId>
     <artifactId>org.opennms.core.ipc.common</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core.ipc.common</groupId>

diff --git a/core/ipc/common/kafka-shell/pom.xml b/core/ipc/common/kafka-shell/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc.common</artifactId>
     <groupId>org.opennms.core.ipc</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/ipc/common/kafka/pom.xml b/core/ipc/common/kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <groupId>org.opennms.core.ipc</groupId>
       <artifactId>org.opennms.core.ipc.common</artifactId>
-      <version>26.0.0</version>
+      <version>26.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opennms.core.ipc.common</groupId>

diff --git a/core/ipc/common/pom.xml b/core/ipc/common/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opennms.core</groupId>
     <artifactId>org.opennms.core.ipc</artifactId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core.ipc</groupId>

diff --git a/core/ipc/grpc/client/pom.xml b/core/ipc/grpc/client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc.grpc</artifactId>
     <groupId>org.opennms.core.ipc</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/ipc/grpc/common/pom.xml b/core/ipc/grpc/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc.grpc</artifactId>
     <groupId>org.opennms.core.ipc</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opennms.core.ipc.grpc</groupId>

diff --git a/core/ipc/grpc/itests/pom.xml b/core/ipc/grpc/itests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc.grpc</artifactId>
     <groupId>org.opennms.core.ipc</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/ipc/grpc/osgi/pom.xml b/core/ipc/grpc/osgi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc.grpc</artifactId>
     <groupId>org.opennms.core.ipc</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/ipc/grpc/pom.xml b/core/ipc/grpc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.opennms.core.ipc</artifactId>
     <groupId>org.opennms.core</groupId>
-    <version>26.0.0</version>
+    <version>26.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <name>OpenNMS :: Core :: IPC :: GRPC :: Parent</name>