claudio4j commented on code in PR #1161:
URL: https://github.com/apache/camel-k-runtime/pull/1161#discussion_r1474356980
##########
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:
The previous code retrieved only the first artifact (see index zero)
`artifacts.get(0)`.
With the proposed change, I moved the artifacts collection to the capability
definition.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
