This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/agent-framewok-refactoring by
this push:
new ea0a19a9ae included codehaus jackson dependency for helix
ea0a19a9ae is described below
commit ea0a19a9ae61dcb69c2be813b82bfb631f782ca5
Author: lahiruj <[email protected]>
AuthorDate: Wed Feb 12 13:46:47 2025 -0500
included codehaus jackson dependency for helix
---
modules/airavata-helix/agent-api/pom.xml | 5 +++++
.../java/org/apache/airavata/agents/api/AdaptorParams.java | 2 +-
modules/distribution/pom.xml | 12 ++++++++++++
.../src/main/assembly/controller-bin-assembly.xml | 2 ++
.../src/main/assembly/parser-wm-bin-assembly.xml | 2 ++
.../src/main/assembly/participant-bin-assembly.xml | 2 ++
.../distribution/src/main/assembly/post-wm-bin-assembly.xml | 2 ++
.../distribution/src/main/assembly/pre-wm-bin-assembly.xml | 2 ++
pom.xml | 1 +
9 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/modules/airavata-helix/agent-api/pom.xml
b/modules/airavata-helix/agent-api/pom.xml
index 04e1a8f2fe..7467f0e658 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -53,6 +53,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
</dependencies>
<!--<build>
diff --git
a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
index f177282e02..beab284b45 100644
---
a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
+++
b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.agents.api;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
import java.io.File;
import java.io.IOException;
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3f406e3736..00df7bc48f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -401,6 +401,18 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
+
+ <!-- For Helix -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
</dependencies>
<url>http://airavata.apache.org/</url>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index de6e6195a0..0083f219bb 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -119,7 +119,9 @@
<include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
<include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
<include>org.apache.airavata:job-monitor-api:jar</include>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index ecac54475f..97732c6b6c 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -119,7 +119,9 @@
<include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
<include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
<include>org.apache.airavata:job-monitor-api:jar</include>
diff --git
a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 421f3d2c42..fc7c456719 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -121,7 +121,9 @@
<include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
<include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
<include>org.apache.airavata:job-monitor-api:jar</include>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 3226c7333c..a122a4e87a 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -119,7 +119,9 @@
<include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
<include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
<include>org.apache.airavata:job-monitor-api:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index e5a231304e..373b3db9b6 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -119,7 +119,9 @@
<include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
<include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
<include>org.apache.airavata:job-monitor-api:jar</include>
diff --git a/pom.xml b/pom.xml
index 05f6b16c88..6487b69ecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
<keycloak.admin.client.version>24.0.4</keycloak.admin.client.version>
<rest.easy.client.version>6.2.8.Final</rest.easy.client.version>
<httpclient.version>4.5.14</httpclient.version>
+ <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
</properties>
<dependencies>
