Skip to content

DPE-903: aling Jolokia version with Karaf #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

DPE-903: aling Jolokia version with Karaf #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Jenkinsfile.talend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ org.apache.camel:camel-minio,\
org.apache.camel:camel-mongodb,\
org.apache.camel:camel-observation,\
org.apache.camel:camel-pdf,\
org.apache.camel:camel-platform-http-jolokia,\
org.apache.camel:camel-quartz,\
org.apache.camel:camel-ref,\
org.apache.camel:camel-rest-openapi,\
Expand Down
2 changes: 2 additions & 0 deletions components/camel-platform-http-jolokia/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@

<name>Camel :: Platform HTTP :: Jolokia</name>
<description>Jolokia plugin for standalone Camel HTTP Platform</description>
<version>${revision}</version>

<properties>
<revision>${camel-platform-http-jolokia.tesb.version}</revision>
<firstVersion>4.5.0</firstVersion>
<title>Platform HTTP Jolokia</title>
<label>http,monitoring</label>
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class DefaultJolokiaPlatformHttpPlugin extends ServiceSupport implements
public DefaultJolokiaPlatformHttpPlugin() {
var config = new StaticConfiguration(ConfigKey.AGENT_ID, NetworkUtil.getAgentId(hashCode(), "vertx"));
jolokiaLogHandler = new JolokiaLogHandler(LOG);
var restrictor = createRestrictor(NetworkUtil.replaceExpression(config.getConfig(ConfigKey.POLICY_LOCATION)));
var restrictor = createRestrictor(config.getConfig(ConfigKey.POLICY_LOCATION));

serviceManager = JolokiaServiceManagerFactory.createJolokiaServiceManager(
config,
Expand Down
6 changes: 3 additions & 3 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<jedis-client-version>5.1.5</jedis-client-version>
<jetcd-version>0.8.3</jetcd-version>
<jetty-version>12.0.18</jetty-version>
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jettison-version>1.5.4</jettison-version>
Expand All @@ -290,7 +290,7 @@
<jira-rest-client-api-version>6.0.1</jira-rest-client-api-version>
<libthrift-version>0.20.0</libthrift-version>
<jodatime2-version>2.12.7</jodatime2-version>
<jolokia-version>2.1.2</jolokia-version>
<jolokia-version>2.2.8</jolokia-version>
<jolt-version>0.1.8</jolt-version>
<jool-version>0.9.15</jool-version>
<jooq-version>3.19.14</jooq-version>
Expand Down Expand Up @@ -2040,7 +2040,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http-jolokia</artifactId>
<version>${upstream.version}</version>
<version>${camel-platform-http-jolokia.tesb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<camel-mongodb.tesb.version>4.8.1.20250320</camel-mongodb.tesb.version>
<camel-observation.tesb.version>4.8.1.20250320</camel-observation.tesb.version>
<camel-pdf.tesb.version>4.8.1.20250320</camel-pdf.tesb.version>
<camel-platform-http-jolokia.tesb.version>4.8.1.20250320</camel-platform-http-jolokia.tesb.version>
<camel-quartz.tesb.version>4.8.1.20250320</camel-quartz.tesb.version>
<camel-ref.tesb.version>4.8.1.20250320</camel-ref.tesb.version>
<camel-rest-openapi.tesb.version>4.8.1.20250320</camel-rest-openapi.tesb.version>
Expand Down Expand Up @@ -356,6 +357,7 @@
<camel-mongodb.tesb.version>${camel-mongodb.tesb.version}</camel-mongodb.tesb.version>
<camel-observation.tesb.version>${camel-observation.tesb.version}</camel-observation.tesb.version>
<camel-pdf.tesb.version>${camel-pdf.tesb.version}</camel-pdf.tesb.version>
<camel-platform-http-jolokia.tesb.version>${camel-platform-http-jolokia.tesb.version}</camel-platform-http-jolokia.tesb.version>
<camel-quartz.tesb.version>${camel-quartz.tesb.version}</camel-quartz.tesb.version>
<camel-ref.tesb.version>${camel-ref.tesb.version}</camel-ref.tesb.version>
<camel-rest-openapi.tesb.version>${camel-rest-openapi.tesb.version}</camel-rest-openapi.tesb.version>
Expand Down