squakez commented on code in PR #1161:
URL: https://github.com/apache/camel-k-runtime/pull/1161#discussion_r1473996353
##########
support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java:
##########
@@ -524,23 +525,26 @@ private void addCapabilities(RuntimeSpec.Builder
runtimeSpec, CamelCatalogSpec.B
artifacts.clear();
artifacts.add(Artifact.from("org.apache.camel.quarkus",
"camel-quarkus-management"));
artifacts.add(Artifact.from("org.apache.camel.quarkus",
"camel-quarkus-jaxb"));
- artifacts.add(Artifact.from("org.jolokia", "jolokia-jvm"));
- addCapabilityAndDependecies(runtimeSpec, catalogSpec, "jolokia",
artifacts, false);
+ artifacts.add(Artifact.from("org.jolokia", "jolokia-agent-jvm",
"javaagent"));
Review Comment:
According to the test I've done, we require more dependencies. Here the
list:
https://github.com/apache/camel-k/pull/5090/commits/9072947913a2d3b5360614711b87d8d7df8818c9#diff-96c9016f9dac002d63c2658bc26f05604540fdb0d51d2c87d978747ce0c41a57R235-R265
##########
support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java:
##########
@@ -524,23 +525,26 @@ private void addCapabilities(RuntimeSpec.Builder
runtimeSpec, CamelCatalogSpec.B
artifacts.clear();
artifacts.add(Artifact.from("org.apache.camel.quarkus",
"camel-quarkus-management"));
artifacts.add(Artifact.from("org.apache.camel.quarkus",
"camel-quarkus-jaxb"));
- artifacts.add(Artifact.from("org.jolokia", "jolokia-jvm"));
- addCapabilityAndDependecies(runtimeSpec, catalogSpec, "jolokia",
artifacts, false);
+ artifacts.add(Artifact.from("org.jolokia", "jolokia-agent-jvm",
"javaagent"));
+ addCapabilityAndDependecies(runtimeSpec, catalogSpec, "jolokia",
artifacts, true);
}
private void addCapabilityAndDependecies(RuntimeSpec.Builder runtimeSpec,
CamelCatalogSpec.Builder catalogSpec, String name,
- List<Artifact> artifacts, boolean addDependency) {
+ List<Artifact> artifacts, boolean addDependency) {
if (capabilitiesExclusionList != null &&
!capabilitiesExclusionList.contains(name)) {
CamelCapability.Builder capBuilder = new CamelCapability.Builder();
- artifacts.forEach(artifact ->
capBuilder.addDependency(artifact.getGroupId(), artifact.getArtifactId()));
+ artifacts.forEach(artifact -> {
+ capBuilder.addDependency(artifact.getGroupId(),
artifact.getArtifactId(), artifact.getClassifier());
+ if (addDependency) {
Review Comment:
Why would this be required?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
