You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/05/23 00:32:41 UTC
(airavata) 06/06: gather all dependency versions to /pom.xml. fix bugs.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 9d87a83c469168b3d6fa220af7e19e15f911ed74
Author: yasithdev <ya...@icloud.com>
AuthorDate: Tue Apr 29 13:10:17 2025 -0500
gather all dependency versions to /pom.xml. fix bugs.
---
airavata-api/airavata-api-server/pom.xml | 55 +-
airavata-api/airavata-api-stubs/pom.xml | 4 +-
airavata-api/airavata-base-api/pom.xml | 9 +-
.../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 4 +-
.../airavata-client-sdks/airavata-php-sdk/pom.xml | 2 -
.../java-client-samples/pom.xml | 1 -
airavata-api/airavata-data-models/pom.xml | 30 +-
airavata-api/airavata-model-utils/pom.xml | 11 +-
.../profile-service-commons/pom.xml | 4 -
.../profile-service/profile-user-core/pom.xml | 2 -
airavata-services/services-security/pom.xml | 61 +-
modules/agent-framework/agent-service/pom.xml | 25 -
modules/airavata-helix/agent-api/pom.xml | 1 -
.../airavata-helix/agent-impl/ssh-agent/pom.xml | 2 -
.../airavata-helix/agent-impl/sshj-agent/pom.xml | 1 -
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 1 +
modules/airavata-helix/helix-spectator/pom.xml | 87 +-
modules/airavata-helix/task-api/pom.xml | 4 -
.../metadata-analyzer/pom.xml | 1 -
.../metascheduler-core/pom.xml | 1 -
.../process-scheduler/pom.xml | 1 -
modules/cluster-monitoring/pom.xml | 12 +-
modules/commons/pom.xml | 115 ++-
.../common/utils/DBConnectionProvider.java | 72 --
modules/compute-account-provisioning/pom.xml | 3 -
.../computer-resource-monitoring-service/pom.xml | 1 -
.../credential-store-service/pom.xml | 61 +-
modules/distribution/agent-service-dist/pom.xml | 3 -
modules/distribution/api-server-dist/pom.xml | 3 -
modules/distribution/controller-dist/pom.xml | 3 -
modules/distribution/email-monitor-dist/pom.xml | 3 -
modules/distribution/file-server-dist/pom.xml | 2 -
modules/distribution/parser-wm-dist/pom.xml | 2 -
modules/distribution/participant-dist/pom.xml | 3 -
modules/distribution/pom.xml | 26 -
modules/distribution/post-wm-dist/pom.xml | 3 -
modules/distribution/pre-wm-dist/pom.xml | 3 -
modules/distribution/realtime-monitor-dist/pom.xml | 2 -
modules/distribution/research-service-dist/pom.xml | 2 -
modules/file-server/pom.xml | 3 -
modules/ide-integration/pom.xml | 1 -
.../app/tests/selenium/pom.xml | 21 -
modules/job-monitor/email-monitor/pom.xml | 2 -
modules/job-monitor/job-monitor-api/pom.xml | 10 +-
modules/job-monitor/pom.xml | 23 -
modules/messaging/client/pom.xml | 18 +-
modules/messaging/core/pom.xml | 21 +-
modules/platform-monitoring/pom.xml | 8 -
modules/registry/registry-core/pom.xml | 32 +-
.../research-framework/research-service/pom.xml | 38 +-
modules/security/pom.xml | 15 +-
modules/server/pom.xml | 11 +-
.../sharing-registry/sharing-data-migrator/pom.xml | 3 -
.../sharing-registry-server/pom.xml | 3 -
.../sharing-registry-stubs/pom.xml | 1 -
pom.xml | 1061 ++++++++++++--------
tools/load-client/pom.xml | 17 +-
57 files changed, 902 insertions(+), 1012 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 661c72faa4..47703066cf 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -37,7 +37,18 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
@@ -45,27 +56,27 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -75,53 +86,41 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>airavata-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-security</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>compute-account-provisioning</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>services-security</artifactId>
+ <artifactId>profile-service-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>compute-account-provisioning</artifactId>
+ <artifactId>registry-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>services-security</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-stubs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
diff --git a/airavata-api/airavata-api-stubs/pom.xml b/airavata-api/airavata-api-stubs/pom.xml
index 87f9adc7db..54b0f6481c 100644
--- a/airavata-api/airavata-api-stubs/pom.xml
+++ b/airavata-api/airavata-api-stubs/pom.xml
@@ -44,12 +44,12 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml
index 62ca3828b6..edc16f7d7d 100644
--- a/airavata-api/airavata-base-api/pom.xml
+++ b/airavata-api/airavata-base-api/pom.xml
@@ -14,10 +14,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
@@ -25,7 +21,10 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
index 77dd5b2954..438ea30cd4 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
@@ -36,10 +36,9 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index fef35b610e..33e40d72af 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index 4bb34ace55..79df863ad5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>${json-simple.version}</version>
</dependency>
</dependencies>
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 98c5cb95d4..cbb2816c6a 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -37,10 +37,6 @@
<url>http://airavata.apache.org/</url>
<dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
@@ -48,8 +44,32 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/airavata-api/airavata-model-utils/pom.xml b/airavata-api/airavata-model-utils/pom.xml
index dbd53b65df..150cfc8470 100644
--- a/airavata-api/airavata-model-utils/pom.xml
+++ b/airavata-api/airavata-model-utils/pom.xml
@@ -37,17 +37,16 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 2b57061cbe..28c98e82b8 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
- <version>${dozer.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -61,7 +60,6 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
</dependency>
</dependencies>
@@ -70,7 +68,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -78,7 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index 42c7f51353..01147056fa 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -59,7 +58,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml
index 5c2b032fe7..8920a51049 100644
--- a/airavata-services/services-security/pom.xml
+++ b/airavata-services/services-security/pom.xml
@@ -36,6 +36,18 @@
<url>http://airavata.apache.org/</url>
<dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
@@ -53,36 +65,22 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>platform-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api-stubs</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -96,14 +94,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
@@ -114,9 +104,16 @@
<artifactId>json</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>platform-monitoring</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 8a4ae0dff2..361308d59a 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -38,18 +38,6 @@
<agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
@@ -94,17 +82,14 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${grpc-server-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
@@ -118,19 +103,10 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
-
<plugins>
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-maven-plugin.version}</version>
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
@@ -148,7 +124,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml
index 48e5c1b0b5..86fc8dadaf 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.slf4j.impl}</version>
</dependency>
</dependencies>
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
index d7aebd024e..a818e24b6c 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
@@ -14,7 +14,6 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -33,7 +32,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
index aa517ba0a0..8b4214f214 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
- <version>${sshj.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
index 74c08c205b..7de0bcd243 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
@@ -24,6 +24,7 @@ import net.schmizz.sshj.DefaultConfig;
import net.schmizz.sshj.connection.ConnectionException;
import net.schmizz.sshj.connection.channel.direct.Session;
import net.schmizz.sshj.sftp.FileAttributes;
+import net.schmizz.sshj.sftp.FileMode.Type;
import net.schmizz.sshj.sftp.RemoteResourceInfo;
import net.schmizz.sshj.transport.verification.HostKeyVerifier;
import net.schmizz.sshj.userauth.keyprovider.KeyProvider;
diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml
index 028f96e020..0a94bed267 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -33,19 +33,34 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>task-core</artifactId>
- <version>${project.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java</artifactId>
<exclusions>
<exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-service</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -53,11 +68,21 @@
<artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>job-monitor-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>profile-service-stubs</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>services-security</artifactId>
@@ -65,8 +90,14 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>task-core</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -76,55 +107,23 @@
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>job-monitor-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java</artifactId>
- <version>${docker-java.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>2.21.1</version>
- </dependency>
</dependencies>
</project>
diff --git a/modules/airavata-helix/task-api/pom.xml b/modules/airavata-helix/task-api/pom.xml
index 53945d2ae1..63e09e7ae2 100644
--- a/modules/airavata-helix/task-api/pom.xml
+++ b/modules/airavata-helix/task-api/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
- <version>${helix.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -73,17 +72,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index da1db41afc..326806644a 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index 8b9a2829f9..4a26f228ab 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml
index e4cb478e20..a35f2f7afc 100644
--- a/modules/airavata-metascheduler/process-scheduler/pom.xml
+++ b/modules/airavata-metascheduler/process-scheduler/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 4a3528a851..f853ad308f 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -55,17 +55,18 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -76,11 +77,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${google.gson.version}</version>
- </dependency>
</dependencies>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 18727cf1ef..b04f7754d2 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -37,115 +37,114 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>com.github.dozermapper</groupId>
- <artifactId>dozer-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-base-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-model-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.common</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
- <!-- Testing -->
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-base-api</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<properties>
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
index 62fbc713b7..de1c23ec78 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
@@ -5,10 +5,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.UnknownKeyFor;
import org.hibernate.HibernateException;
-import org.hibernate.dialect.DatabaseVersion;
-import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.Stoppable;
@@ -17,7 +14,6 @@ import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.SQLException;
-import java.text.MessageFormat;
import java.time.Duration;
import java.util.Map;
@@ -114,72 +110,4 @@ public class DBConnectionProvider implements ConnectionProvider, Configurable, S
}
throw new UnknownUnwrapTypeException(unwrapType);
}
-
- /**
- * Provides connection info for Hibernate to display or use internally.
- * If you wish, you can parse the DB name from the URL or set it to null.
- */
- @Override
- public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
- return new DatabaseConnectionInfo() {
- @Override
- public String getJdbcUrl() {
- return dataSource.getUrl();
- }
-
- @Override
- public String getJdbcDriver() {
- return dataSource.getDriverClassName();
- }
-
- @Override
- public DatabaseVersion getDialectVersion() {
- return DatabaseVersion.make(8, 0);
- }
-
- @Override
- public String getAutoCommitMode() {
- boolean autoCommit = dataSource.getDefaultAutoCommit();
- return Boolean.toString(autoCommit);
- }
-
- @Override
- public String getIsolationLevel() {
- int isolation = dataSource.getDefaultTransactionIsolation();
- return switch (isolation) {
- case Connection.TRANSACTION_NONE -> "TRANSACTION_NONE";
- case Connection.TRANSACTION_READ_UNCOMMITTED -> "TRANSACTION_READ_UNCOMMITTED";
- case Connection.TRANSACTION_READ_COMMITTED -> "TRANSACTION_READ_COMMITTED";
- case Connection.TRANSACTION_REPEATABLE_READ -> "TRANSACTION_REPEATABLE_READ";
- case Connection.TRANSACTION_SERIALIZABLE -> "TRANSACTION_SERIALIZABLE";
- default -> "UNKNOWN_ISOLATION_LEVEL";
- };
- }
-
- @Override
- public Integer getPoolMinSize() {
- return dataSource.getConnectionPool().getMinIdle();
- }
-
- @Override
- public Integer getPoolMaxSize() {
- return dataSource.getConnectionPool().getMaxTotal();
- }
-
- @Override
- public String toInfoString() {
- return MessageFormat.format(dataSourceAsString,
- dataSource.getDriverClassName(),
- dataSource.getUrl(),
- dataSource.getUserName(),
- dataSource.getValidationQuery(),
- dataSource.getInitialSize(),
- dataSource.getMaxTotal(),
- dataSource.getMaxIdle(),
- dataSource.getMinIdle(),
- dataSource.getMaxWaitDuration()
- );
- }
- };
- }
}
\ No newline at end of file
diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml
index 9332c06e70..faced80777 100644
--- a/modules/compute-account-provisioning/pom.xml
+++ b/modules/compute-account-provisioning/pom.xml
@@ -45,13 +45,11 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
</dependency>
<!-- apache directory ldap api! -->
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>${directory.api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -61,7 +59,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${google.gson.version}</version>
</dependency>
</dependencies>
diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml
index 78b58e66e9..648043ab93 100644
--- a/modules/computer-resource-monitoring-service/pom.xml
+++ b/modules/computer-resource-monitoring-service/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index ff61805c7a..be834479e0 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -35,25 +35,37 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
@@ -70,40 +82,21 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>2.0.9</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
</dependencies>
diff --git a/modules/distribution/agent-service-dist/pom.xml b/modules/distribution/agent-service-dist/pom.xml
index adece4adf0..7759cf08a7 100644
--- a/modules/distribution/agent-service-dist/pom.xml
+++ b/modules/distribution/agent-service-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${agent.service.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-agent-service-configuration</id>
@@ -96,7 +94,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/api-server-dist/pom.xml b/modules/distribution/api-server-dist/pom.xml
index eac90d1b90..ba44f9986b 100644
--- a/modules/distribution/api-server-dist/pom.xml
+++ b/modules/distribution/api-server-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${api.server.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-api-server-configuration</id>
@@ -96,7 +94,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/controller-dist/pom.xml b/modules/distribution/controller-dist/pom.xml
index f3bc5bfd9d..7a9c21edad 100644
--- a/modules/distribution/controller-dist/pom.xml
+++ b/modules/distribution/controller-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${controller.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-controller-assembly</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/email-monitor-dist/pom.xml b/modules/distribution/email-monitor-dist/pom.xml
index e88bca8c68..f440301748 100644
--- a/modules/distribution/email-monitor-dist/pom.xml
+++ b/modules/distribution/email-monitor-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${email.monitor.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-email-monitor-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/file-server-dist/pom.xml b/modules/distribution/file-server-dist/pom.xml
index 876ae0855a..62111da02e 100644
--- a/modules/distribution/file-server-dist/pom.xml
+++ b/modules/distribution/file-server-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${file.server.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-file-server-resources</id>
diff --git a/modules/distribution/parser-wm-dist/pom.xml b/modules/distribution/parser-wm-dist/pom.xml
index 82d8df1931..7c14072366 100644
--- a/modules/distribution/parser-wm-dist/pom.xml
+++ b/modules/distribution/parser-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${parser.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-parser-wm-resources</id>
diff --git a/modules/distribution/participant-dist/pom.xml b/modules/distribution/participant-dist/pom.xml
index 3b7f90c849..b72f05c3c1 100644
--- a/modules/distribution/participant-dist/pom.xml
+++ b/modules/distribution/participant-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${participant.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-participant-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0bf69076c4..e2cb2beaed 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -61,30 +61,4 @@
<agent.service.dist.name>apache-airavata-agent-service-${project.version}</agent.service.dist.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <descriptors>
- <descriptor>src/main/assembly/distribution-assembly.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/modules/distribution/post-wm-dist/pom.xml b/modules/distribution/post-wm-dist/pom.xml
index 4d2360df01..4acb404bfc 100644
--- a/modules/distribution/post-wm-dist/pom.xml
+++ b/modules/distribution/post-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${post.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-post-wm-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/pre-wm-dist/pom.xml b/modules/distribution/pre-wm-dist/pom.xml
index df598f3874..e21b8aa418 100644
--- a/modules/distribution/pre-wm-dist/pom.xml
+++ b/modules/distribution/pre-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${pre.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-pre-wm-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/realtime-monitor-dist/pom.xml b/modules/distribution/realtime-monitor-dist/pom.xml
index b55b6c3753..7d32a80127 100644
--- a/modules/distribution/realtime-monitor-dist/pom.xml
+++ b/modules/distribution/realtime-monitor-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${realtime.monitor.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-realtime-monitor-resources</id>
diff --git a/modules/distribution/research-service-dist/pom.xml b/modules/distribution/research-service-dist/pom.xml
index efcd64f6fc..7b39a1230f 100644
--- a/modules/distribution/research-service-dist/pom.xml
+++ b/modules/distribution/research-service-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${research.service.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-research-service-resources</id>
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index 261f1369b8..d319c10a27 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -14,7 +14,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -49,12 +48,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 9a8eac19dc..a42f4caa87 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
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 8c1f827a3d..8fe6893276 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
@@ -13,7 +13,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -21,7 +20,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
<configuration>
<includes>
<include>**/RunAllTests.java</include>
@@ -56,18 +54,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>${selenium-maven-plugin.version}</version>
- <!--executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>false</background>
- </configuration>
- </execution>
- </executions -->
</plugin>
</plugins>
</build>
@@ -75,13 +61,11 @@
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>${selenium-java-client-driver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
- <version>${selenium-firefox-driver.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -90,23 +74,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>${commons-exec.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
- <version>${selenium-remote-driver.version}</version>
</dependency>
-
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>${selenium-java.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml
index 21837db680..2abfb58818 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/job-monitor-api/pom.xml b/modules/job-monitor/job-monitor-api/pom.xml
index 18c29e1fd1..255df34cd7 100644
--- a/modules/job-monitor/job-monitor-api/pom.xml
+++ b/modules/job-monitor/job-monitor-api/pom.xml
@@ -34,14 +34,16 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>task-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index bdea010d88..8f44bd064a 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -35,27 +35,4 @@
<module>email-monitor</module>
<module>real-time-monitor</module>
</modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>jakarta.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>task-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
index 5cdf1fa61a..9abdb40cfb 100644
--- a/modules/messaging/client/pom.xml
+++ b/modules/messaging/client/pom.xml
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -50,28 +50,28 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
index 426029e504..99d570715c 100644
--- a/modules/messaging/core/pom.xml
+++ b/modules/messaging/core/pom.xml
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -46,13 +46,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.slf4j.impl}</version>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -63,8 +58,12 @@
<artifactId>airavata-server-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml
index d9629f4e3e..e53b4166a2 100644
--- a/modules/platform-monitoring/pom.xml
+++ b/modules/platform-monitoring/pom.xml
@@ -33,29 +33,21 @@
<dependencies>
- <!-- The client -->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Hotspot JVM metrics-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Exposition HTTPServer-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Pushgateway exposition-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_pushgateway</artifactId>
- <version>${prometheus.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 7ae26269c6..b1cccc0caa 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -34,22 +34,10 @@
<artifactId>airavata-registry-core</artifactId>
<dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@@ -65,18 +53,29 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
+ <artifactId>airavata-data-models</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-cpi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
</dependency>
- <!-- For MariaDB based schema migrations -->
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
@@ -89,7 +88,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -97,7 +95,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<configuration>
<executable>java</executable>
<classpathScope>runtime</classpathScope>
@@ -187,7 +184,6 @@
<plugin>
<groupId>com.dkanejs.maven.plugins</groupId>
<artifactId>docker-compose-maven-plugin</artifactId>
- <version>${docker-compose-maven-plugin.version}</version>
<executions>
<execution>
<id>mysql-up</id>
diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml
index b37d3a1dcf..336bc9dbd9 100644
--- a/modules/research-framework/research-service/pom.xml
+++ b/modules/research-framework/research-service/pom.xml
@@ -29,32 +29,6 @@
<artifactId>research-service</artifactId>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-bom</artifactId>
- <version>${grpc.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-bom</artifactId>
- <version>${protobuf-java.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
@@ -141,22 +115,14 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- </extension>
- </extensions>
-
<plugins>
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-maven-plugin.version}</version>
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
- <sourceDirectory>src/main/proto</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory>
</sourceDirectories>
<outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
</configuration>
@@ -171,7 +137,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -179,7 +144,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.maven.plugin.version}</version>
</plugin>
</plugins>
</build>
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
index 8dd805adb2..05c9c83496 100644
--- a/modules/security/pom.xml
+++ b/modules/security/pom.xml
@@ -34,24 +34,23 @@
<description>Module for managing security features in Airavata</description>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro-core.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 6ae4fcccd9..dbc27f0c25 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -37,7 +37,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -52,20 +51,20 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-api-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-server</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
<version>${project.version}</version>
diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml
index bcbfe0caf2..4917771923 100644
--- a/modules/sharing-registry/sharing-data-migrator/pom.xml
+++ b/modules/sharing-registry/sharing-data-migrator/pom.xml
@@ -38,7 +38,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -46,7 +45,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -104,7 +102,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 10e1e3a51b..6a33a6c98f 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.databene</groupId>
<artifactId>contiperf</artifactId>
- <version>${contiperf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -93,7 +91,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
</plugin>
</plugins>
<resources>
diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml
index 75a9cd4cdc..7902dd627b 100644
--- a/modules/sharing-registry/sharing-registry-stubs/pom.xml
+++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
diff --git a/pom.xml b/pom.xml
index c29886fb64..4a6e4fa38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,139 +103,138 @@
</modules>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.version>0.21-SNAPSHOT</project.version>
- <spring.boot.maven.plugin.version>3.2.4</spring.boot.maven.plugin.version>
- <org.slf4j.version>2.0.16</org.slf4j.version>
- <log4j2.version>2.24.3</log4j2.version>
- <log4j2.slf4j.impl>2.24.3</log4j2.slf4j.impl>
- <surefire.version>3.0.0-M4</surefire.version>
- <junit.version>4.13.2</junit.version>
- <curator.version>5.6.0</curator.version>
- <groovy.version>4.0.26</groovy.version>
- <xpp3.version>1.1.6</xpp3.version>
- <xpp5.version>1.2.8</xpp5.version>
- <xsul.version>2.10.7</xsul.version>
- <xsul5.version>1.2.7</xsul5.version>
- <atomixmiser.version>0.9.4</atomixmiser.version>
- <fasterxml.jackson.version>2.18.1</fasterxml.jackson.version>
- <jakarta.activation.api.version>2.1.2</jakarta.activation.api.version>
- <jersey.version>1.13</jersey.version>
- <cargo.version>1.3.1</cargo.version>
- <oa4mp.version>4.3</oa4mp.version>
- <antrun.version>1.8</antrun.version>
- <bouncy.castle.version>1.77</bouncy.castle.version>
- <ebay.cors.filter>1.0.0</ebay.cors.filter>
- <thrift.version>0.21.0</thrift.version>
- <mysql.connector.version>8.2.0</mysql.connector.version>
- <skipTests>false</skipTests>
- <google.gson.version>2.10.1</google.gson.version>
- <zk.version>3.9.3</zk.version>
- <amqp-client.version>5.25.0</amqp-client.version>
- <snakeyaml.version>2.2</snakeyaml.version>
- <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
- <maven.javadoc.skip>false</maven.javadoc.skip>
- <maven.deploy.skip>false</maven.deploy.skip>
- <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
- <maven.assembly.plugin>3.3.0</maven.assembly.plugin>
- <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
- <kafka-clients.version>3.7.1</kafka-clients.version>
- <json.version>20231013</json.version>
- <google.guava.version>33.0.0-jre</google.guava.version>
- <jacoco.version>0.8.1</jacoco.version>
- <dozer.version>6.5.2</dozer.version>
- <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
- <javax.annotation.version>1.3.2</javax.annotation.version>
- <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
- <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
- <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
+ <amqp-client.version>5.20.0</amqp-client.version>
<angus-activation.version>2.0.1</angus-activation.version>
- <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
- <jmockit.version>1.49</jmockit.version>
- <helix.version>1.4.3</helix.version>
- <keycloak.client.version>26.0.5</keycloak.client.version>
- <spring.boot.version>3.2.4</spring.boot.version>
- <spring.security.oauth2.version>6.3.5</spring.security.oauth2.version>
+ <antrun.version>3.1.0</antrun.version>
<aopalliance.version>1.0</aopalliance.version>
- <jsch.version>0.1.55</jsch.version>
- <sshj.version>0.39.0</sshj.version>
- <quartz.version>2.4.0</quartz.version>
- <directory.api.version>1.0.0</directory.api.version>
- <mariadb-java-client.version>3.5.2</mariadb-java-client.version>
- <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
- <grpc-server-spring-boot-starter.version>2.15.0.RELEASE</grpc-server-spring-boot-starter.version>
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
- <commons-io.version>2.15.1</commons-io.version>
- <commons-pool2.version>2.12.1</commons-pool2.version>
- <commons-dbcp2.version>2.13.0</commons-dbcp2.version>
- <commons-cli.version>1.9.0</commons-cli.version>
- <commons-email.version>1.5</commons-email.version>
+ <bouncy.castle.version>1.77</bouncy.castle.version>
+ <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
+ <cargo.version>1.10.12</cargo.version>
+ <commons-cli.version>1.6.0</commons-cli.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <commons-lang3.version>3.14.0</commons-lang3.version>
<commons-configuration2.version>2.9.0</commons-configuration2.version>
+ <commons-dbcp2.version>2.11.0</commons-dbcp2.version>
+ <commons-email.version>1.6.0</commons-email.version>
<commons-exec.version>1.4.0</commons-exec.version>
- <commons-codec.version>1.16.1</commons-codec.version>
- <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+ <commons-io.version>2.15.1</commons-io.version>
+ <commons-lang3.version>3.14.0</commons-lang3.version>
+ <commons-logging.version>1.3.0</commons-logging.version>
+ <commons-pool2.version>2.12.1</commons-pool2.version>
+ <contiperf.version>2.3.4</contiperf.version>
+ <curator.version>5.6.0</curator.version>
+ <derby.version>10.17.1.0</derby.version>
+ <directory.api.version>1.0.0</directory.api.version>
+ <distribution.plugin.version>3.3.1</distribution.plugin.version>
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
- <ibatis-sqlmap.version>2.3.0</ibatis-sqlmap.version>
- <testng.version>7.7.0</testng.version>
- <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
- <shiro-core.version>2.0.2</shiro-core.version>
- <tomcat-embed-core.version>11.0.3</tomcat-embed-core.version>
- <tomcat-embed-logging-juli.version>8.5.2</tomcat-embed-logging-juli.version>
+ <docker-java.version>3.3.5</docker-java.version>
+ <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
+ <dozer.version>6.5.2</dozer.version>
+ <ebay.cors.filter>1.0.1</ebay.cors.filter>
+ <exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
+ <fasterxml.jackson.version>2.17.0</fasterxml.jackson.version>
+ <google.gson.version>2.10.1</google.gson.version>
+ <google.guava.version>33.0.0-jre</google.guava.version>
+ <groovy.version>4.0.19</groovy.version>
+ <grpc-server-spring-boot-starter.version>2.15.0.RELEASE</grpc-server-spring-boot-starter.version>
+ <grpc.version>1.62.2</grpc.version>
<guice.version>7.0.0</guice.version>
- <templating.maven.version>1.0.0</templating.maven.version>
- <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
- <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
- <contiperf.version>2.3.4</contiperf.version>
- <docker-java.version>3.4.2</docker-java.version>
- <prometheus.version>0.16.0</prometheus.version>
- <jakarta.mail.version>2.0.2</jakarta.mail.version>
- <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
- <servlet-api.version>2.5</servlet-api.version>
- <jets3t.version>0.8.0</jets3t.version>
- <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
- <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
- <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
- <maven-surefire-plugin.version>2.12.4</maven-surefire-plugin.version>
- <json-simple.version>1.1</json-simple.version>
- <xerces.version>2.12.2</xerces.version>
- <icu4j.version>3.4.4</icu4j.version>
- <hamcrest.version>1.1</hamcrest.version>
- <mockito.version>1.8.5</mockito.version>
- <jopt-simple.version>3.2</jopt-simple.version>
- <selenium-maven-plugin.version>2.3</selenium-maven-plugin.version>
- <selenium-java-client-driver.version>1.0.1</selenium-java-client-driver.version>
- <selenium-firefox-driver.version>2.44.0</selenium-firefox-driver.version>
- <selenium-remote-driver.version>2.44.0</selenium-remote-driver.version>
- <selenium-java.version>2.44.0</selenium-java.version>
- <jackson-core-asl.version>1.9.13</jackson-core-asl.version>
- <snappy-java.version>1.1.10.7</snappy-java.version>
- <netty.version>4.2.0.Final</netty.version>
- <logback.version>1.4.14</logback.version>
- <hibernate-core.version>6.6.13.Final</hibernate-core.version>
- <hibernate-commons-annotations.version>7.0.3.Final</hibernate-commons-annotations.version>
- <protobuf-java.version>3.25.5</protobuf-java.version>
- <protobuf-maven-plugin.version>3.1.2</protobuf-maven-plugin.version>
- <grpc.version>1.61.1</grpc.version>
+ <hamcrest.version>2.2</hamcrest.version>
+ <helix.version>1.4.3</helix.version>
+ <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version>
+ <hibernate-core.version>6.4.4.Final</hibernate-core.version>
+ <httpclient.version>4.5.14</httpclient.version>
+ <httpclient5.version>5.3.1</httpclient5.version>
+ <ibatis-sqlmap.version>2.3.4.726</ibatis-sqlmap.version>
+ <icu4j.version>74.2</icu4j.version>
<j2objc-annotations.version>2.8</j2objc-annotations.version>
+ <jacoco.version>0.8.11</jacoco.version>
+ <jackson.version>2.17.0</jackson.version>
+ <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
+ <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
- <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
- <springdoc.version>2.5.0</springdoc.version>
- <slf4j.version>2.0.9</slf4j.version>
+ <jakarta.mail.version>2.0.3</jakarta.mail.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
- <spring-boot.version>3.2.3</spring-boot.version>
- <jackson.version>2.17.2</jackson.version>
- <netty.version>4.1.106.Final</netty.version>
+ <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
+ <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+ <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
+ <jaxb-api.version>2.3.1</jaxb-api.version>
+ <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
+ <javax.annotation.version>1.3.2</javax.annotation.version>
+ <jmockit.version>1.49</jmockit.version>
+ <jopt-simple.version>5.0.4</jopt-simple.version>
+ <json-simple.version>1.1.1</json-simple.version>
+ <json.version>20240205</json.version>
+ <jsch.version>0.1.55</jsch.version>
+ <junit.version>4.13.2</junit.version>
+ <kafka-clients.version>3.7.0</kafka-clients.version>
+ <keycloak.client.version>24.0.1</keycloak.client.version>
+ <log4j-to-slf4j.version>2.23.1</log4j-to-slf4j.version>
+ <log4j2.slf4j.impl>2.23.1</log4j2.slf4j.impl>
+ <log4j2.version>2.23.1</log4j2.version>
+ <logback.version>1.4.14</logback.version>
+ <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
+ <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+ <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+ <maven-remote-resources-plugin.version>3.1.0</maven-remote-resources-plugin.version>
+ <maven-assembly-plugin.version>3.7.0</maven-assembly-plugin.version>
+ <maven.deploy.skip>false</maven.deploy.skip>
+ <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+ <maven.javadoc.skip>false</maven.javadoc.skip>
+ <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
+ <mockito-core.version>5.11.0</mockito-core.version>
+ <mockito.version>5.11.0</mockito.version>
+ <mysql.connector.version>8.3.0</mysql.connector.version>
+ <netty.version>4.1.107.Final</netty.version>
+ <oa4mp.version>4.3</oa4mp.version>
+ <org.slf4j.version>2.0.12</org.slf4j.version>
+ <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.version>0.21-SNAPSHOT</project.version>
+ <prometheus.version>0.16.0</prometheus.version>
+ <protobuf-java.version>3.25.3</protobuf-java.version>
+ <protobuf-maven-plugin.version>3.1.2</protobuf-maven-plugin.version>
+ <quartz.version>2.5.0-rc1</quartz.version>
<reactor.version>3.6.3</reactor.version>
- <httpclient.version>4.5.14</httpclient.version>
- <httpclient5.version>5.4.3</httpclient5.version>
- <maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
- <derby.version>10.16.1.1</derby.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <shiro-core.version>2.0.0</shiro-core.version>
+ <skipTests>false</skipTests>
+ <slf4j.version>2.0.12</slf4j.version>
+ <snakeyaml.version>2.4</snakeyaml.version>
+ <snappy-java.version>1.1.10.5</snappy-java.version>
+ <spring.boot.maven.plugin.version>3.4.5</spring.boot.maven.plugin.version>
+ <spring.boot.version>3.4.5</spring.boot.version>
+ <spring.security.oauth2.version>6.2.2</spring.security.oauth2.version>
+ <springdoc.version>2.3.0</springdoc.version>
+ <sshj.version>0.38.0</sshj.version>
+ <surefire.version>3.2.5</surefire.version>
+ <templating.maven.version>1.0.0</templating.maven.version>
+ <testng.version>7.9.0</testng.version>
+ <thrift.version>0.21.0</thrift.version>
+ <tomcat-embed-core.version>11.0.0-M17</tomcat-embed-core.version>
+ <tomcat-embed-logging-juli.version>9.0.0.M6</tomcat-embed-logging-juli.version>
+ <xerces.version>2.12.2</xerces.version>
+ <zk.version>3.9.2</zk.version>
+ <checker-qual.version>3.41.0</checker-qual.version>
+ <rest.easy.client.version>6.2.12.Final</rest.easy.client.version>
</properties>
<dependencies>
+ <!-- Alphabetically sorted dependencies -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -244,116 +243,75 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-common</artifactId>
- <version>${springdoc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>${aopalliance.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.4</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>${netty.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty.version}</version>
- <classifier>linux-x86_64</classifier>
+ <groupId>org.databene</groupId>
+ <artifactId>contiperf</artifactId>
+ <version>${contiperf.version}</version>
</dependency>
<dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- <version>${reactor.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat-embed-core.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java</artifactId>
+ <version>${docker-java.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>${bouncy.castle.version}</version>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <version>${dozer.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- <version>${bouncy.castle.version}</version>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -361,44 +319,41 @@
<version>${google.gson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.20.0</version>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- <version>${curator.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google.guava.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-bom</artifactId>
+ <version>${protobuf-java.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>${mysql.connector.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -406,55 +361,56 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons-configuration2.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
- <scope>test</scope>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf-lite</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${json.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-services</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.helix</groupId>
- <artifactId>helix-core</artifactId>
- <version>${helix.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy-java.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-util</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -463,53 +419,53 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
+ <artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
+ <artifactId>netty-common</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
+ <artifactId>netty-resolver</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
+ <artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
+ <artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java</artifactId>
- <version>${docker-java.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.version}</version>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
@@ -517,64 +473,189 @@
<version>${jakarta.activation-api.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta.xml.bind-api.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistence-api.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>${jakarta.persistence-api.version}</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>net.devh</groupId>
+ <artifactId>grpc-server-spring-boot-starter</artifactId>
+ <version>${grpc-server-spring-boot-starter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-configuration2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>${commons-email.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>helix-core</artifactId>
+ <version>${helix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>${httpclient5.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ibatis</groupId>
+ <artifactId>ibatis-sqlmap</artifactId>
+ <version>${ibatis-sqlmap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>${kafka-clients.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j-to-slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zk.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncy.castle.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bouncy.castle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checker-qual.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
@@ -582,14 +663,9 @@
<version>${angus-activation.version}</version>
</dependency>
<dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>2.20.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- <version>${j2objc-annotations.version}</version>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta.mail.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -606,160 +682,204 @@
<artifactId>txw2</artifactId>
<version>${jaxb-runtime.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate-commons-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <version>${jmockit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-admin-client</artifactId>
+ <version>${keycloak.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-authz-client</artifactId>
+ <version>${keycloak.client.version}</version>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-bom</artifactId>
- <version>${grpc.version}</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-bom</artifactId>
- <version>${protobuf-java.version}</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
- <version>${springdoc.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>net.devh</groupId>
- <artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${grpc-server-spring-boot-starter.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>com.github.dozermapper</groupId>
- <artifactId>dozer-core</artifactId>
- <version>${dozer.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-common</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.common</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate-commons-annotations.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ibatis</groupId>
- <artifactId>ibatis-sqlmap</artifactId>
- <version>${ibatis-sqlmap.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp-client.version}</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <!-- Internal dependencies -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
+ <artifactId>airavata-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-configuration</artifactId>
+ <artifactId>airavata-base-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>airavata-credential-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
+ <artifactId>airavata-messaging-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-base-api</artifactId>
+ <artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-stubs</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-client</artifactId>
+ <artifactId>airavata-orchestrator-cpi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store</artifactId>
+ <artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>cluster-monitoring</artifactId>
+ <artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>metascheduler-core</artifactId>
+ <artifactId>airavata-server-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>process-scheduler</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>metadata-analyzer</artifactId>
+ <artifactId>cluster-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -769,133 +889,181 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-server</artifactId>
+ <artifactId>metadata-analyzer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
+ <artifactId>metascheduler-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
+ <artifactId>process-scheduler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-cpi</artifactId>
+ <artifactId>profile-service-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
+ <artifactId>registry-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>${quartz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-authz-client</artifactId>
- <version>${keycloak.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro-core.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.3.4</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_hotspot</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_httpserver</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <version>${grpc.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_pushgateway</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-lite</artifactId>
- <version>${grpc.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-services</artifactId>
- <version>${grpc.version}</version>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>${directory.api.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-util</artifactId>
- <version>${grpc.version}</version>
+ <groupId>com.hierynomus</groupId>
+ <artifactId>sshj</artifactId>
+ <version>${sshj.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
- <version>${grpc.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf-java.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>${httpclient5.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core-spi</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>${selenium-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.maven.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.dkanejs.maven.plugins</groupId>
+ <artifactId>docker-compose-maven-plugin</artifactId>
+ <version>${docker-compose-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>templating-maven-plugin</artifactId>
+ <version>${templating.maven.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>io.github.ascopes</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf-maven-plugin.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
- <version>${templating.maven.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -909,7 +1077,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>${maven-remote-resources-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -949,7 +1116,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -957,7 +1123,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
<skipTests>${skipTests}</skipTests>
@@ -993,6 +1158,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.dkanejs.maven.plugins</groupId>
+ <artifactId>docker-compose-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml
index 8d23be03eb..0bf75845bc 100644
--- a/tools/load-client/pom.xml
+++ b/tools/load-client/pom.xml
@@ -14,6 +14,10 @@
<url>http://airavata.apache.org/</url>
<dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
@@ -25,12 +29,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -41,8 +41,8 @@
<artifactId>keycloak-authz-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
</dependency>
</dependencies>
<build>
@@ -50,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<executions>
<execution>
<id>load-client-distribution-package</id>