Merge remote-tracking branch 'origin/ranger/jolokia-cleanup' into fou…

…ndation-2023
OpenNMS · Nov 22, 2023 · c2e8e35 · c2e8e35
2 parents bd76e70 + a4236fb
commit c2e8e35
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml
@@ -273,6 +273,16 @@
         </capability>
     </feature>
 
+    <feature name="jolokia" description="Jolokia monitoring support" version="${jolokiaVersion}">
+        <config name="org.jolokia.osgi">
+org.jolokia.user=karaf
+org.jolokia.realm=karaf
+org.jolokia.authMode=jaas
+        </config>
+        <bundle>mvn:org.jolokia/jolokia-osgi/${jolokiaVersion}</bundle>
+        <requirement>osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"</requirement>
+    </feature>
+
     <feature name="netty" version="${netty4Version}" description="Netty">
         <feature>bouncycastle</feature>
         <bundle dependency="true">mvn:io.netty/netty-buffer/${netty4Version}</bundle>

diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
@@ -159,12 +159,12 @@
     <feature name="joda-time" version="${jodaTimeVersion}" description="Joda :: Joda-Time">
         <bundle>mvn:joda-time/joda-time/${jodaTimeVersion}</bundle>
     </feature>
-    <feature name="jolokia-client" version="${jolokiaClientVersion}" description="Jolokia-Client">
+    <feature name="jolokia-client" version="${jolokiaVersion}" description="Jolokia-Client">
         <feature>javax.servlet</feature>
         <feature>json-simple</feature>
         <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcoreVersion}</bundle>
         <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclientVersion}</bundle>
-        <bundle>mvn:org.jolokia/jolokia-client-java/${jolokiaClientVersion}</bundle>
+        <bundle>mvn:org.jolokia/jolokia-client-java/${jolokiaVersion}</bundle>
     </feature>
     <feature name="jrobin" version="1.6.0" description="JRobin">
         <bundle>mvn:org.jrobin/jrobin/1.6.0</bundle>

diff --git a/container/karaf/src/main/filtered-resources/etc/overrides.properties b/container/karaf/src/main/filtered-resources/etc/overrides.properties
@@ -16,6 +16,8 @@ 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.jolokia/jolokia-osgi/${jolokiaVersion}
+mvn:org.jolokia/jolokia-client-java/${jolokiaVersion}
 
 # Just In Case (tm) make sure Jetty always gets only our vetted version
 mvn:org.eclipse.jetty/jetty-client/${jettyVersion};range=[9.4,10)

diff --git a/container/shared/src/main/filtered-resources/etc/overrides.properties b/container/shared/src/main/filtered-resources/etc/overrides.properties
@@ -16,6 +16,8 @@ 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.jolokia/jolokia-osgi/${jolokiaVersion}
+mvn:org.jolokia/jolokia-client-java/${jolokiaVersion}
 
 # Just In Case (tm) make sure Jetty always gets only our vetted version
 mvn:org.eclipse.jetty/jetty-client/${jettyVersion};range=[9.4,10)

diff --git a/pom.xml b/pom.xml
@@ -1705,7 +1705,7 @@
     <jmxremote.optional.version>1.0_01-ea</jmxremote.optional.version>
     <jnaVersion>5.12.1</jnaVersion>
     <jodaTimeVersion>2.12.5</jodaTimeVersion>
-    <jolokiaClientVersion>1.7.2</jolokiaClientVersion>
+    <jolokiaVersion>1.7.2</jolokiaVersion>
     <jqwikVersion>1.6.5</jqwikVersion>
     <jrrdVersion>1.1.0</jrrdVersion>
     <jrrd2Version>2.0.3</jrrd2Version>
@@ -4734,7 +4734,7 @@
       <dependency>
         <groupId>org.jolokia</groupId>
         <artifactId>jolokia-client-java</artifactId>
-        <version>${jolokiaClientVersion}</version>
+        <version>${jolokiaVersion}</version>
       <exclusions>
         <exclusion>
           <artifactId>commons-logging</artifactId>