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 0b67b3cfbf Fix dependency issues by replacing org.codehaus.jackson
with com.fasterxml.jackson
0b67b3cfbf is described below
commit 0b67b3cfbf0926ebbdc51a86f83ecb6d0d9a6e60
Author: lahiruj <[email protected]>
AuthorDate: Mon Jan 27 14:37:58 2025 -0500
Fix dependency issues by replacing org.codehaus.jackson with
com.fasterxml.jackson
---
airavata-api/airavata-api-server/pom.xml | 6 ++---
.../airavata-cpp-sdk/src/main/resources/LICENSE | 4 ++--
.../iam-admin-services-core/pom.xml | 4 ++--
airavata-services/services-security/pom.xml | 6 ++---
modules/airavata-helix/agent-api/pom.xml | 6 ++---
.../apache/airavata/agents/api/AdaptorParams.java | 5 ++--
modules/distribution/pom.xml | 28 +++++++---------------
.../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 --
.../src/main/assembly/post-wm-bin-assembly.xml | 2 --
.../src/main/assembly/pre-wm-bin-assembly.xml | 2 --
.../src/main/resources/api-server/LICENSE | 4 ++--
pom.xml | 3 +--
14 files changed, 27 insertions(+), 49 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml
b/airavata-api/airavata-api-server/pom.xml
index 5a7b0d5172..cc05814161 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -134,9 +134,9 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
index 24cb886727..5b99dde6ac 100644
---
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
+++
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
@@ -212,8 +212,8 @@ The following components come under Apache Software License
2.0
apache axiom, apache axis2, apache commons, apache derby, apache geronimo,
apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema,
-aws-java-sdk-1.1.8.jar, bcel-5.1.jar, Codehaus Jackson
(jackson-core-asl-1.9.2.jar,
-jackson-jaxrs-1.9.2.jar, jackson-mapper-asl-1.9.2.jar, jackson-xc-1.9.2.jar,
+aws-java-sdk-1.1.8.jar, bcel-5.1.jar, Codehaus Jackson
(jackson-core-2.15.4.jar,
+jackson-jaxrs-json-provider-2.15.4.jar, jackson-databind-2.15.4.jar,
jackson-module-jaxb-annotations-2.15.4.jar,
jets3t-0.8.0.jar, jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries
(pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar
diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml
b/airavata-services/profile-service/iam-admin-services-core/pom.xml
index 0a727d33d4..3c40866258 100644
--- a/airavata-services/profile-service/iam-admin-services-core/pom.xml
+++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
- <version>3.0.14.Final</version>
+ <version>${rest.easy.client.version}</version>
</dependency>
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<!--
https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
<dependency>
diff --git a/airavata-services/services-security/pom.xml
b/airavata-services/services-security/pom.xml
index e964edbd74..7bddbfb28a 100644
--- a/airavata-services/services-security/pom.xml
+++ b/airavata-services/services-security/pom.xml
@@ -82,9 +82,9 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-helix/agent-api/pom.xml
b/modules/airavata-helix/agent-api/pom.xml
index 655824839e..04e1a8f2fe 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -33,9 +33,9 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.5</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
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 85ea5c2006..f177282e02 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,14 +19,13 @@
*/
package org.apache.airavata.agents.api;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.io.IOException;
-import java.io.ObjectInputStream;
/**
- * TODO: Class level comments please
+ * This class provides methods to serialize and deserialize its instances to
and from JSON files using Jackson's ObjectMapper
*
* @author dimuthu
* @since 1.0.0-SNAPSHOT
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 29ddd6b88d..3f406e3736 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -221,24 +221,14 @@
<version>7.0.22</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -298,17 +288,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.core.version}</version>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.core.version}</version>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<!-- zookeeper dependencies -->
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index 4b49506804..b27328ab52 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -119,9 +119,7 @@
<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 0107642eac..5b678c6fdf 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -119,9 +119,7 @@
<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 39024d3041..bf39f2151d 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -121,9 +121,7 @@
<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 a122a4e87a..3226c7333c 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -119,9 +119,7 @@
<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 9d4fab7f1a..f3cef192f6 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -119,9 +119,7 @@
<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/resources/api-server/LICENSE
b/modules/distribution/src/main/resources/api-server/LICENSE
index 56f7cc2aed..2c713cc35a 100644
--- a/modules/distribution/src/main/resources/api-server/LICENSE
+++ b/modules/distribution/src/main/resources/api-server/LICENSE
@@ -212,8 +212,8 @@ The following components come under Apache Software License
2.0
apache axiom, apache axis2, apache commons, apache derby, apache geronimo,
apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema,
-aws-java-sdk-1.1.8.jar, bcel-5.1.jar, Codehaus Jackson
(jackson-core-asl-1.9.2.jar,
-jackson-jaxrs-1.9.2.jar, jackson-mapper-asl-1.9.2.jar, jackson-xc-1.9.2.jar,
+aws-java-sdk-1.1.8.jar, bcel-5.1.jar, Codehaus Jackson
(jackson-core-2.15.4.jar,
+jackson-jaxrs-json-provider-2.15.4.jar, jackson-databind-2.15.4.jar,
jackson-module-jaxb-annotations-2.15.4.jar,
jets3t-0.8.0.jar, jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries
(pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar
diff --git a/pom.xml b/pom.xml
index a9aa8dd98d..05f6b16c88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,8 +120,7 @@
<xsul.version>2.10.7</xsul.version>
<xsul5.version>1.2.7</xsul5.version>
<atomixmiser.version>0.9.4</atomixmiser.version>
- <jackson.core.version>2.9.10</jackson.core.version>
- <jackson.databind.version>2.9.10.8</jackson.databind.version>
+ <fasterxml.jackson.version>2.15.4</fasterxml.jackson.version>
<jersey.version>1.13</jersey.version>
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.1.3</oa4mp.version>
