This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch keycloak-upgrade
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/keycloak-upgrade by this push:
new e1fc3d5735 Upgrading outdated dependencies
e1fc3d5735 is described below
commit e1fc3d5735607911b777f33aec1d5b7dfeecebde
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Fri Sep 13 21:55:15 2024 -0400
Upgrading outdated dependencies
---
airavata-api/airavata-api-server/pom.xml | 2 +-
modules/commons/pom.xml | 5 +----
modules/distribution/pom.xml | 17 +----------------
modules/ide-integration/README.md | 3 +++
.../airavata-php-gateway/app/tests/selenium/pom.xml | 5 -----
pom.xml | 19 ++++++++++---------
6 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml
b/airavata-api/airavata-api-server/pom.xml
index 75cb9599e8..8aa0b30b15 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>4.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 57fa5bf294..b5a393bcab 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -60,10 +60,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 22a50f6d96..b02363faf1 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -256,22 +256,7 @@
<artifactId>icu4j</artifactId>
<version>3.4.4</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <!-- Hadoop provider related dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>1.0.3</version>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
@@ -330,7 +315,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.0</version>
+ <version>${zk.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/modules/ide-integration/README.md
b/modules/ide-integration/README.md
index 6ac08fa260..f07dbd5d45 100644
--- a/modules/ide-integration/README.md
+++ b/modules/ide-integration/README.md
@@ -67,6 +67,9 @@ Using this module, you can setup a full Airavata installation
inside Intelij IDE
### Starting API Server
+#### Note: For JDK 11+
+you have to add ``--add-opens java.base/java.lang=ALL-UNNAMED`` as a JVM
argument
+
* Go to org.apache.airavata.ide.integration.APIServerStarter class and right
click on the editor and click Run option. This will start Airavata server
### Starting Job Execution Engine
diff --git
a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
index 5432e3dfd9..bb3fe6bf50 100755
---
a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
+++
b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
@@ -118,11 +118,6 @@
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
diff --git a/pom.xml b/pom.xml
index 5c3eb04522..f5a26fa35a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,11 +108,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.13.1.1</derby.version>
- <org.slf4j.version>2.0.13</org.slf4j.version>
- <log4j2.version>2.23.1</log4j2.version>
+ <org.slf4j.version>2.0.16</org.slf4j.version>
+ <log4j2.slf4j.impl>2.18.0</log4j2.slf4j.impl>
+ <log4j2.version>2.24.0</log4j2.version>
<surefire.version>3.0.0-M4</surefire.version>
<junit.version>4.12</junit.version>
- <curator.version>2.8.0</curator.version>
+ <curator.version>5.7.0</curator.version>
<groovy.version>2.4.7</groovy.version>
<xpp3.version>1.1.6</xpp3.version>
<xpp5.version>1.2.8</xpp5.version>
@@ -131,7 +132,7 @@
<mysql.connector.version>5.1.34</mysql.connector.version>
<skipTests>false</skipTests>
<google.gson.version>2.10.1</google.gson.version>
- <zk.version>3.4.0</zk.version>
+ <zk.version>3.9.2</zk.version>
<amqp.client.version>3.5.1</amqp.client.version>
<snakeyaml.version>1.15</snakeyaml.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
@@ -140,7 +141,7 @@
<kafka-clients.version>1.0.0</kafka-clients.version>
<json.version>20160212</json.version>
<commons.io.version>2.11.0</commons.io.version>
- <google.guava.version>20.0</google.guava.version>
+ <google.guava.version>33.2.1-jre</google.guava.version>
<jacoco.version>0.8.1</jacoco.version>
<openjpa.version>3.1.0</openjpa.version>
<dozer.version>5.4.0</dozer.version>
@@ -170,7 +171,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -202,8 +203,8 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
+ <artifactId>log4j-slf4j18-impl</artifactId>
+ <version>${log4j2.slf4j.impl}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -369,7 +370,7 @@
<!-- Integration tests are run using the fail-safe plugin
in the module
pom -->
<useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m
+ <argLine>-Xmx1024m -XX:MaxPermSize=256m --add-opens
java.base/java.lang=ALL-UNNAMED
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
</argLine>
