Skip to content

Commit c47378d

Browse files
authored
DPE-903: aling Jolokia version with Karaf (#136)
1 parent c97202f commit c47378d

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

Jenkinsfile.talend

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ org.apache.camel:camel-minio,\
5353
org.apache.camel:camel-mongodb,\
5454
org.apache.camel:camel-observation,\
5555
org.apache.camel:camel-pdf,\
56+
org.apache.camel:camel-platform-http-jolokia,\
5657
org.apache.camel:camel-quartz,\
5758
org.apache.camel:camel-ref,\
5859
org.apache.camel:camel-rest-openapi,\

components/camel-platform-http-jolokia/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131

3232
<name>Camel :: Platform HTTP :: Jolokia</name>
3333
<description>Jolokia plugin for standalone Camel HTTP Platform</description>
34+
<version>${revision}</version>
3435

3536
<properties>
37+
<revision>${camel-platform-http-jolokia.tesb.version}</revision>
3638
<firstVersion>4.5.0</firstVersion>
3739
<title>Platform HTTP Jolokia</title>
3840
<label>http,monitoring</label>

components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class DefaultJolokiaPlatformHttpPlugin extends ServiceSupport implements
6969
public DefaultJolokiaPlatformHttpPlugin() {
7070
var config = new StaticConfiguration(ConfigKey.AGENT_ID, NetworkUtil.getAgentId(hashCode(), "vertx"));
7171
jolokiaLogHandler = new JolokiaLogHandler(LOG);
72-
var restrictor = createRestrictor(NetworkUtil.replaceExpression(config.getConfig(ConfigKey.POLICY_LOCATION)));
72+
var restrictor = createRestrictor(config.getConfig(ConfigKey.POLICY_LOCATION));
7373

7474
serviceManager = JolokiaServiceManagerFactory.createJolokiaServiceManager(
7575
config,

parent/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
<jedis-client-version>5.1.5</jedis-client-version>
279279
<jetcd-version>0.8.3</jetcd-version>
280280
<jetty-version>12.0.18</jetty-version>
281-
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
281+
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
282282
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
283283
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
284284
<jettison-version>1.5.4</jettison-version>
@@ -290,7 +290,7 @@
290290
<jira-rest-client-api-version>6.0.1</jira-rest-client-api-version>
291291
<libthrift-version>0.20.0</libthrift-version>
292292
<jodatime2-version>2.12.7</jodatime2-version>
293-
<jolokia-version>2.1.2</jolokia-version>
293+
<jolokia-version>2.2.8</jolokia-version>
294294
<jolt-version>0.1.8</jolt-version>
295295
<jool-version>0.9.15</jool-version>
296296
<jooq-version>3.19.14</jooq-version>
@@ -2040,7 +2040,7 @@
20402040
<dependency>
20412041
<groupId>org.apache.camel</groupId>
20422042
<artifactId>camel-platform-http-jolokia</artifactId>
2043-
<version>${upstream.version}</version>
2043+
<version>${camel-platform-http-jolokia.tesb.version}</version>
20442044
</dependency>
20452045
<dependency>
20462046
<groupId>org.apache.camel</groupId>

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
<camel-mongodb.tesb.version>4.8.1.20250320</camel-mongodb.tesb.version>
142142
<camel-observation.tesb.version>4.8.1.20250320</camel-observation.tesb.version>
143143
<camel-pdf.tesb.version>4.8.1.20250320</camel-pdf.tesb.version>
144+
<camel-platform-http-jolokia.tesb.version>4.8.1.20250320</camel-platform-http-jolokia.tesb.version>
144145
<camel-quartz.tesb.version>4.8.1.20250320</camel-quartz.tesb.version>
145146
<camel-ref.tesb.version>4.8.1.20250320</camel-ref.tesb.version>
146147
<camel-rest-openapi.tesb.version>4.8.1.20250320</camel-rest-openapi.tesb.version>
@@ -356,6 +357,7 @@
356357
<camel-mongodb.tesb.version>${camel-mongodb.tesb.version}</camel-mongodb.tesb.version>
357358
<camel-observation.tesb.version>${camel-observation.tesb.version}</camel-observation.tesb.version>
358359
<camel-pdf.tesb.version>${camel-pdf.tesb.version}</camel-pdf.tesb.version>
360+
<camel-platform-http-jolokia.tesb.version>${camel-platform-http-jolokia.tesb.version}</camel-platform-http-jolokia.tesb.version>
359361
<camel-quartz.tesb.version>${camel-quartz.tesb.version}</camel-quartz.tesb.version>
360362
<camel-ref.tesb.version>${camel-ref.tesb.version}</camel-ref.tesb.version>
361363
<camel-rest-openapi.tesb.version>${camel-rest-openapi.tesb.version}</camel-rest-openapi.tesb.version>

0 commit comments

Comments
 (0)