Align dependencies and APIs with upstream SDK 0.1.0

pom.xml

@@ -11,17 +11,20 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <slf4j.version>2.0.17</slf4j.version>
-        <log4j.version>2.25.3</log4j.version>
+        <log4j.version>2.25.4</log4j.version>
         <picocli.version>4.7.7</picocli.version>
         <maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
-        <wanaku.sdk.version>0.1.0-SNAPSHOT</wanaku.sdk.version>
-        <camel.version>4.17.0</camel.version>
+        <wanaku-capabilities-sdk.version>0.1.0</wanaku-capabilities-sdk.version>
+        <camel.version>4.18.1</camel.version>
+        <jackson-databind.version>2.21.2</jackson-databind.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <project.main.class>ai.wanaku.code.engine.camel.CamelEngineMain</project.main.class>
-        <spotless-maven-plugin.version>3.2.1</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version>
         <maven-failsafe-plugin.version>3.5.5</maven-failsafe-plugin.version>
         <commons-compress.version>1.26.0</commons-compress.version>
-        <junit.version>5.11.0</junit.version>
+        <junit.version>5.14.3</junit.version>
+        <jgit.version>7.6.0.202603022253-r</jgit.version>
+        <palantir-format-version.version>2.71.0</palantir-format-version.version>
     </properties>
 
     <dependencyManagement>
@@ -44,7 +47,7 @@
             <dependency>
                 <groupId>ai.wanaku.sdk</groupId>
                 <artifactId>capabilities-bom</artifactId>
-                <version>${wanaku.sdk.version}</version>
+                <version>${wanaku-capabilities-sdk.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -70,7 +73,7 @@
         </dependency>
         <dependency>
             <groupId>ai.wanaku.sdk</groupId>
-            <artifactId>capabilities-runtime</artifactId>
+            <artifactId>capabilities-runtimes-common</artifactId>
         </dependency>
         <dependency>
             <groupId>ai.wanaku.sdk</groupId>
@@ -134,7 +137,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>7.5.0.202512021534-r</version>
+            <version>${jgit.version}</version>
         </dependency>
 
         <!-- Apache Commons Compress for tar.bz2 extraction -->
@@ -212,10 +215,21 @@
                     <configuration>
                         <java>
                             <palantirJavaFormat>
-                                <version>2.71.0</version>
+                                <version>${palantir-format-version.version}</version>
                             </palantirJavaFormat>
                             <removeUnusedImports />
                             <formatAnnotations />
+                            <forbidWildcardImports />
+
+                            <excludes>
+                                <exclude>**/*.properties</exclude>
+                                <exclude>**/*.proto</exclude>
+                            </excludes>
+
+                            <importOrder>
+                                <wildcardsLast>true</wildcardsLast>
+                                <order>jakarta|javax,org.w3c|org.xml,java|org|io|,,\#,org.junit|org.mockito|\#org.assertj|\#org.junit|\#org.mockito</order>
+                            </importOrder>
                         </java>
                     </configuration>
                     <executions>

src/main/java/ai/wanaku/code/engine/camel/CamelEngineMain.java

@@ -1,5 +1,15 @@
 package ai.wanaku.code.engine.camel;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import io.grpc.Grpc;
+import io.grpc.InsecureServerCredentials;
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
 import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
 import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
 import ai.wanaku.capabilities.sdk.api.types.providers.ServiceType;
@@ -22,16 +32,6 @@
 import ai.wanaku.code.engine.camel.init.Initializer;
 import ai.wanaku.code.engine.camel.init.InitializerFactory;
 import ai.wanaku.code.engine.camel.util.VersionHelper;
-import io.grpc.Grpc;
-import io.grpc.InsecureServerCredentials;
-import io.grpc.Server;
-import io.grpc.ServerBuilder;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.Callable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 public class CamelEngineMain implements Callable<Integer> {

src/main/java/ai/wanaku/code/engine/camel/WanakuCamelManager.java

@@ -1,13 +1,13 @@
 package ai.wanaku.code.engine.camel;
 
-import ai.wanaku.code.engine.camel.downloader.ResourceType;
-import ai.wanaku.code.engine.camel.util.WanakuRoutesLoader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
+import ai.wanaku.code.engine.camel.downloader.ResourceType;
+import ai.wanaku.code.engine.camel.util.WanakuRoutesLoader;
 
 public class WanakuCamelManager {
     private final CamelContext context;

src/main/java/ai/wanaku/code/engine/camel/codegen/CodeGenDiscoveryCallback.java

@@ -1,12 +1,5 @@
 package ai.wanaku.code.engine.camel.codegen;
 
-import ai.wanaku.capabilities.sdk.api.discovery.DiscoveryCallback;
-import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
-import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
-import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
-import ai.wanaku.code.engine.camel.downloader.DownloaderFactory;
-import ai.wanaku.code.engine.camel.downloader.ResourceRefs;
-import ai.wanaku.code.engine.camel.downloader.ResourceType;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -16,6 +9,13 @@
 import java.util.concurrent.CountDownLatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.api.discovery.DiscoveryCallback;
+import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
+import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
+import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
+import ai.wanaku.code.engine.camel.downloader.DownloaderFactory;
+import ai.wanaku.code.engine.camel.downloader.ResourceRefs;
+import ai.wanaku.code.engine.camel.downloader.ResourceType;
 
 /**
  * Discovery callback that initializes and registers code generation tools.

src/main/java/ai/wanaku/code/engine/camel/codegen/CodeGenToolRegistrar.java

@@ -1,19 +1,19 @@
 package ai.wanaku.code.engine.camel.codegen;
 
-import ai.wanaku.capabilities.sdk.api.types.InputSchema;
-import ai.wanaku.capabilities.sdk.api.types.Property;
-import ai.wanaku.capabilities.sdk.api.types.ToolReference;
-import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
-import ai.wanaku.code.engine.camel.codegen.tools.GenerateOrchestrationTool;
-import ai.wanaku.code.engine.camel.codegen.tools.ReadKameletTool;
-import ai.wanaku.code.engine.camel.codegen.tools.SearchServicesTool;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.api.types.InputSchema;
+import ai.wanaku.capabilities.sdk.api.types.Property;
+import ai.wanaku.capabilities.sdk.api.types.ToolReference;
+import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
+import ai.wanaku.code.engine.camel.codegen.tools.GenerateOrchestrationTool;
+import ai.wanaku.code.engine.camel.codegen.tools.ReadKameletTool;
+import ai.wanaku.code.engine.camel.codegen.tools.SearchServicesTool;
 
 /**
  * Registers and deregisters code generation tools with Wanaku.

src/main/java/ai/wanaku/code/engine/camel/codegen/CodeGenToolService.java

@@ -1,12 +1,12 @@
 package ai.wanaku.code.engine.camel.codegen;
 
-import ai.wanaku.code.engine.camel.codegen.tools.GenerateOrchestrationTool;
-import ai.wanaku.code.engine.camel.codegen.tools.ReadKameletTool;
-import ai.wanaku.code.engine.camel.codegen.tools.SearchServicesTool;
 import java.net.URI;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.code.engine.camel.codegen.tools.GenerateOrchestrationTool;
+import ai.wanaku.code.engine.camel.codegen.tools.ReadKameletTool;
+import ai.wanaku.code.engine.camel.codegen.tools.SearchServicesTool;
 
 /**
  * Service that handles code generation tool invocations.

src/main/java/ai/wanaku/code/engine/camel/codegen/tools/GenerateOrchestrationTool.java

@@ -1,9 +1,9 @@
 package ai.wanaku.code.engine.camel.codegen.tools;
 
-import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 
 /**
  * Tool that returns the orchestration template for code generation.

src/main/java/ai/wanaku/code/engine/camel/codegen/tools/ReadKameletTool.java

@@ -1,9 +1,9 @@
 package ai.wanaku.code.engine.camel.codegen.tools;
 
-import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 
 /**
  * Tool that reads the content of a Kamelet by name.

src/main/java/ai/wanaku/code/engine/camel/codegen/tools/SearchServicesTool.java

@@ -1,10 +1,10 @@
 package ai.wanaku.code.engine.camel.codegen.tools;
 
-import ai.wanaku.code.engine.camel.codegen.CodeGenConfig;
-import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.code.engine.camel.codegen.CodeGenConfig;
+import ai.wanaku.code.engine.camel.codegen.CodeGenResourceLoader;
 
 /**
  * Tool that searches for available services (Kamelets) in the code generation package.

src/main/java/ai/wanaku/code/engine/camel/downloader/DataStoreDownloader.java

@@ -1,8 +1,5 @@
 package ai.wanaku.code.engine.camel.downloader;
 
-import ai.wanaku.capabilities.sdk.api.types.DataStore;
-import ai.wanaku.capabilities.sdk.api.types.WanakuResponse;
-import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,6 +8,9 @@
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.api.types.DataStore;
+import ai.wanaku.capabilities.sdk.api.types.WanakuResponse;
+import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
 
 public class DataStoreDownloader implements Downloader {
     private static final Logger LOG = LoggerFactory.getLogger(DataStoreDownloader.class);

src/main/java/ai/wanaku/code/engine/camel/downloader/DownloaderFactory.java

@@ -1,10 +1,10 @@
 package ai.wanaku.code.engine.camel.downloader;
 
-import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
 import java.net.URI;
 import java.nio.file.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
 
 /**
  * Factory for creating downloader instances based on URI scheme.

src/main/java/ai/wanaku/code/engine/camel/downloader/ResourceDownloaderCallback.java

@@ -1,9 +1,5 @@
 package ai.wanaku.code.engine.camel.downloader;
 
-import ai.wanaku.capabilities.sdk.api.discovery.DiscoveryCallback;
-import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
-import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
-import ai.wanaku.capabilities.sdk.common.exceptions.WanakuWebException;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -12,6 +8,10 @@
 import java.util.concurrent.CountDownLatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.api.discovery.DiscoveryCallback;
+import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
+import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
+import ai.wanaku.capabilities.sdk.common.exceptions.WanakuWebException;
 
 public class ResourceDownloaderCallback implements DiscoveryCallback {
     private static final Logger LOG = LoggerFactory.getLogger(ResourceDownloaderCallback.class);

src/main/java/ai/wanaku/code/engine/camel/downloader/TarBz2Downloader.java

@@ -1,9 +1,5 @@
 package ai.wanaku.code.engine.camel.downloader;
 
-import ai.wanaku.capabilities.sdk.api.types.DataStore;
-import ai.wanaku.capabilities.sdk.api.types.WanakuResponse;
-import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
-import ai.wanaku.code.engine.camel.util.ArchiveExtractor;
 import java.io.ByteArrayInputStream;
 import java.net.URI;
 import java.nio.file.Files;
@@ -13,6 +9,10 @@
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ai.wanaku.capabilities.sdk.api.types.DataStore;
+import ai.wanaku.capabilities.sdk.api.types.WanakuResponse;
+import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
+import ai.wanaku.code.engine.camel.util.ArchiveExtractor;
 
 /**
  * Downloads and extracts tar.bz2 archives from the Wanaku data store.