This is an automated email from the ASF dual-hosted git repository.

luigidemasi pushed a commit to branch camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit aa09de30a6e01c32b57ea861bae450da106380d3
Author: Luigi De Masi <[email protected]>
AuthorDate: Fri Mar 13 09:52:29 2026 +0100

    CAMEL-23190: [camel-jbang-mcp] DefaultCamelCatalog.getCatalogVersion() 
ignores VersionManager and returns compiled-in version
    
    (cherry picked from commit a2cb62026cae3bb5872da6bea73b2356f3146a53)
    Signed-off-by: Luigi De Masi <[email protected]>
    Co-authored-by: Codex <[email protected]>
---
 .../apache/camel/catalog/DefaultCamelCatalog.java  |   4 +-
 .../camel/catalog/DefaultVersionManager.java       |   5 +-
 .../org/apache/camel/catalog/CamelCatalogTest.java | 106 +++++++++++++++++++++
 3 files changed, 109 insertions(+), 6 deletions(-)

diff --git 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index d312026b25f9..2cf52d244c6b 100644
--- 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -94,8 +94,6 @@ public class DefaultCamelCatalog extends 
AbstractCachingCamelCatalog implements
 
     public static final String SUMMARY_AS_JSON = "summaryAsJson";
 
-    private final VersionHelper version = new VersionHelper();
-
     // 3rd party components/data-formats
     private final Map<String, String> extraComponents = new HashMap<>();
     private final Map<String, String> extraComponentsJSonSchema = new 
HashMap<>();
@@ -199,7 +197,7 @@ public class DefaultCamelCatalog extends 
AbstractCachingCamelCatalog implements
 
     @Override
     public String getCatalogVersion() {
-        return version.getVersion();
+        return versionManager.getLoadedVersion();
     }
 
     @Override
diff --git 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultVersionManager.java
 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultVersionManager.java
index e92392a1fed6..d163ef90c79a 100644
--- 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultVersionManager.java
+++ 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultVersionManager.java
@@ -20,11 +20,10 @@ import java.io.InputStream;
 
 public class DefaultVersionManager implements VersionManager {
 
-    private final CamelCatalog camelCatalog;
+    private final VersionHelper version = new VersionHelper();
     private ClassLoader classLoader;
 
     public DefaultVersionManager(CamelCatalog camelCatalog) {
-        this.camelCatalog = camelCatalog;
     }
 
     @Override
@@ -39,7 +38,7 @@ public class DefaultVersionManager implements VersionManager {
 
     @Override
     public String getLoadedVersion() {
-        return camelCatalog.getCatalogVersion();
+        return version.getVersion();
     }
 
     @Override
diff --git 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 8a1a207b84b6..efd51a17a1d8 100644
--- 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1704,4 +1704,110 @@ public class CamelCatalogTest {
                 f.getDescription());
     }
 
+    @Test
+    public void testDefaultCatalogVersionMatchesLoadedVersion() {
+        // Default catalog: getCatalogVersion() and getLoadedVersion() should 
return the same value
+        CamelCatalog cat = new DefaultCamelCatalog();
+        String catalogVersion = cat.getCatalogVersion();
+        String loadedVersion = cat.getLoadedVersion();
+        assertNotNull(catalogVersion);
+        assertNotNull(loadedVersion);
+        assertEquals(catalogVersion, loadedVersion);
+    }
+
+    @Test
+    public void testCatalogVersionRespectsCustomVersionManager() {
+        // When a custom VersionManager reports a different loaded version,
+        // getCatalogVersion() should return that version (not the built-in 
one)
+        CamelCatalog cat = new DefaultCamelCatalog();
+        String builtInVersion = cat.getCatalogVersion();
+
+        cat.setVersionManager(new VersionManager() {
+            @Override
+            public void setClassLoader(ClassLoader classLoader) {
+            }
+
+            @Override
+            public ClassLoader getClassLoader() {
+                return CamelCatalogTest.class.getClassLoader();
+            }
+
+            @Override
+            public String getLoadedVersion() {
+                return "4.10.0";
+            }
+
+            @Override
+            public boolean loadVersion(String version) {
+                return "4.10.0".equals(version);
+            }
+
+            @Override
+            public String getRuntimeProviderLoadedVersion() {
+                return null;
+            }
+
+            @Override
+            public boolean loadRuntimeProviderVersion(String groupId, String 
artifactId, String version) {
+                return false;
+            }
+
+            @Override
+            public InputStream getResourceAsStream(String name) {
+                return 
CamelCatalogTest.class.getClassLoader().getResourceAsStream(name);
+            }
+        });
+
+        assertEquals("4.10.0", cat.getCatalogVersion());
+        assertEquals("4.10.0", cat.getLoadedVersion());
+        // Sanity: verify we're not accidentally matching the built-in version
+        assertFalse("4.10.0".equals(builtInVersion), "Test is only meaningful 
if 4.10.0 differs from built-in version");
+    }
+
+    @Test
+    public void testSummaryJsonUsesLoadedVersion() {
+        // summaryAsJson() uses getLoadedVersion() — verify it reflects the 
custom version
+        CamelCatalog cat = new DefaultCamelCatalog();
+
+        cat.setVersionManager(new VersionManager() {
+            @Override
+            public void setClassLoader(ClassLoader classLoader) {
+            }
+
+            @Override
+            public ClassLoader getClassLoader() {
+                return CamelCatalogTest.class.getClassLoader();
+            }
+
+            @Override
+            public String getLoadedVersion() {
+                return "99.0.0-test";
+            }
+
+            @Override
+            public boolean loadVersion(String version) {
+                return "99.0.0-test".equals(version);
+            }
+
+            @Override
+            public String getRuntimeProviderLoadedVersion() {
+                return null;
+            }
+
+            @Override
+            public boolean loadRuntimeProviderVersion(String groupId, String 
artifactId, String version) {
+                return false;
+            }
+
+            @Override
+            public InputStream getResourceAsStream(String name) {
+                return 
CamelCatalogTest.class.getClassLoader().getResourceAsStream(name);
+            }
+        });
+
+        String json = cat.summaryAsJson();
+        assertNotNull(json);
+        assertTrue(json.contains("99.0.0-test"), "summaryAsJson should contain 
the custom version");
+    }
+
 }

Reply via email to