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 1fe9785eba9ea117132b0cca49d12f94f13df5bd Author: yasith <[email protected]> AuthorDate: Thu Mar 20 20:15:11 2025 +0000 parametrize pom versions. add maven-enforcer rule for dependency convergence and fix version issues. --- airavata-api/airavata-api-server/pom.xml | 6 +- airavata-api/airavata-base-api/pom.xml | 6 + .../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 4 +- .../airavata-client-sdks/airavata-php-sdk/pom.xml | 4 +- .../java-client-samples/pom.xml | 4 +- airavata-api/airavata-data-models/pom.xml | 5 + airavata-services/pom.xml | 2 +- .../iam-admin-services-core/pom.xml | 4 +- .../profile-service-commons/pom.xml | 10 +- airavata-services/services-security/pom.xml | 13 +- dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +- modules/agent-framework/agent-service/pom.xml | 33 +- .../airavata-helix/agent-impl/ssh-agent/pom.xml | 6 +- .../airavata-helix/agent-impl/sshj-agent/pom.xml | 3 +- modules/airavata-helix/helix-spectator/pom.xml | 21 +- .../metadata-analyzer/pom.xml | 7 +- .../metascheduler-core/pom.xml | 8 +- .../process-scheduler/pom.xml | 14 +- modules/cluster-monitoring/pom.xml | 8 +- modules/commons/pom.xml | 10 +- modules/compute-account-provisioning/pom.xml | 6 +- .../computer-resource-monitoring-service/pom.xml | 9 +- .../credential-store-service/pom.xml | 18 +- .../credential-store-stubs/pom.xml | 2 +- modules/distribution/pom.xml | 58 +-- .../src/main/assembly/api-server-bin-assembly.xml | 2 +- .../src/main/assembly/controller-bin-assembly.xml | 8 +- .../main/assembly/email-monitor-bin-assembly.xml | 5 +- .../src/main/assembly/parser-wm-bin-assembly.xml | 8 +- .../src/main/assembly/participant-bin-assembly.xml | 14 +- .../src/main/assembly/post-wm-bin-assembly.xml | 8 +- .../src/main/assembly/pre-wm-bin-assembly.xml | 8 +- .../assembly/realtime-monitor-bin-assembly.xml | 2 +- modules/file-server/pom.xml | 1 + modules/ide-integration/pom.xml | 2 +- .../app/tests/selenium/pom.xml | 33 +- modules/job-monitor/email-monitor/pom.xml | 7 +- modules/job-monitor/job-monitor-api/pom.xml | 3 +- modules/job-monitor/pom.xml | 8 +- modules/messaging/client/pom.xml | 1 + modules/orchestrator/orchestrator-core/pom.xml | 2 +- modules/orchestrator/orchestrator-service/pom.xml | 8 - modules/platform-monitoring/pom.xml | 10 +- modules/registry/registry-core/pom.xml | 18 +- .../registry-server/registry-api-service/pom.xml | 1 + .../registry-server/registry-api-stubs/pom.xml | 1 + .../registry/registry-tools/registry-tool/pom.xml | 10 +- modules/security/pom.xml | 6 +- modules/server/pom.xml | 4 +- .../sharing-registry/sharing-data-migrator/pom.xml | 9 +- .../sharing-registry-distribution/pom.xml | 9 +- .../sharing-registry-server/pom.xml | 20 +- pom.xml | 390 ++++++++++++++++++--- tools/load-client/pom.xml | 10 +- 54 files changed, 568 insertions(+), 303 deletions(-) diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index cc05814161..c4d1702487 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -121,17 +121,17 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>7.0.0</version> + <version>${guice.version}</version> </dependency> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> - <version>1.0</version> + <version>${aopalliance.version}</version> </dependency> <dependency> <groupId>org.apache.oltu.oauth2</groupId> <artifactId>org.apache.oltu.oauth2.client</artifactId> - <version>1.0.0</version> + <version>${oltu.oauth2.client.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml index 1a7f837845..1884e489cd 100644 --- a/airavata-api/airavata-base-api/pom.xml +++ b/airavata-api/airavata-base-api/pom.xml @@ -6,6 +6,7 @@ <artifactId>airavata-api</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -18,6 +19,11 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation.version}</version> + </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> 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 fe7cffd281..77dd5b2954 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml @@ -39,7 +39,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>unpack</id> @@ -85,7 +85,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> + <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 91052cc17b..fef35b610e 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,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>unpack</id> @@ -85,7 +85,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> + <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 b749862ee7..5ff4a3dcc5 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml +++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml @@ -75,12 +75,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4</version> + <version>${httpcore.version}</version> </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>1.1</version> + <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 7003496de2..8fd5d8c260 100644 --- a/airavata-api/airavata-data-models/pom.xml +++ b/airavata-api/airavata-data-models/pom.xml @@ -43,6 +43,11 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation.version}</version> + </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml index 9e6b2e8dda..c3519945db 100644 --- a/airavata-services/pom.xml +++ b/airavata-services/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml index 1d02d39acf..9f95c5fa15 100644 --- a/airavata-services/profile-service/iam-admin-services-core/pom.xml +++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml @@ -39,13 +39,13 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>${rest.easy.client.version}</version> + <version>${resteasy.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider --> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jackson2-provider</artifactId> - <version>${rest.easy.client.version}</version> + <version>${resteasy.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> <dependency> diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml index 3394c9aff0..b1217453d5 100644 --- a/airavata-services/profile-service/profile-service-commons/pom.xml +++ b/airavata-services/profile-service/profile-service-commons/pom.xml @@ -49,6 +49,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -57,8 +61,8 @@ <version>${openjpa.version}</version> </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> <version>${mysql.connector.version}</version> </dependency> <dependency> @@ -90,8 +94,6 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <!--<source>17</source>--> - <!--<target>17</target>--> <release>17</release> </configuration> </plugin> diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml index 7bddbfb28a..77ce01b352 100644 --- a/airavata-services/services-security/pom.xml +++ b/airavata-services/services-security/pom.xml @@ -69,28 +69,23 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>4.0</version> + <version>${guice.version}</version> </dependency> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> - <version>1.0</version> + <version>${aopalliance.version}</version> </dependency> <dependency> <groupId>org.apache.oltu.oauth2</groupId> <artifactId>org.apache.oltu.oauth2.client</artifactId> - <version>1.0.0</version> + <version>${oltu.oauth2.client.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>${fasterxml.jackson.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-sharing-registry-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> @@ -100,7 +95,7 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20131018</version> + <version>${json.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml index 0f6fa218b5..0719c25c83 100644 --- a/dev-tools/ansible/roles/api-orch/defaults/main.yml +++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml @@ -30,7 +30,7 @@ iam_server_super_admin_username: "admin" profile_service_host: "localhost" profile_service_port: 8962 -mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"; +mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-3.5.2/mariadb-java-client-3.5.2.jar"; sharing_registry_tls_enabled: "false" api_server_bind_host: "{{ ansible_default_ipv4.address }}" diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index 8bfe2020a2..43c6ef67ec 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -26,6 +26,7 @@ <groupId>org.apache.airavata</groupId> <artifactId>agent-framework</artifactId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>agent-service</artifactId> @@ -34,14 +35,6 @@ <maven.compiler.source>17</maven.compiler.source> <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jul-to-slf4j.version>1.7.0</jul-to-slf4j.version> - <json.version>20240303</json.version> - <javax.version>2.0.1.Final</javax.version> - <apache.commons.lang3.version>3.14.0</apache.commons.lang3.version> - <mysql.connector.java>8.0.31</mysql.connector.java> - <protoc.version>4.30.1</protoc.version> - <protobuf-plugin.version>2.12.1</protobuf-plugin.version> - <grpc.version>1.71.0</grpc.version> <agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name> </properties> @@ -61,7 +54,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>1.5.7</version> + <version>${mariadb-java-client.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -109,20 +102,15 @@ <artifactId>grpc-protobuf</artifactId> <version>${grpc.version}</version> </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>${protoc.version}</version> - </dependency> <dependency> <groupId>net.devh</groupId> <artifactId>grpc-server-spring-boot-starter</artifactId> - <version>3.0.0.RELEASE</version> + <version>${grpc-server-spring-boot-starter.version}</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.3.2</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -136,7 +124,7 @@ <extension> <groupId>kr.motd.maven</groupId> <artifactId>os-maven-plugin</artifactId> - <version>1.7.0</version> + <version>${os-maven-plugin.version}</version> </extension> </extensions> @@ -166,9 +154,9 @@ <plugin> <groupId>io.github.ascopes</groupId> <artifactId>protobuf-maven-plugin</artifactId> - <version>${protobuf-plugin.version}</version> + <version>${protobuf-maven-plugin.version}</version> <configuration> - <protocVersion>${protoc.version}</protocVersion> + <protocVersion>${protobuf-java.version}</protocVersion> <sourceDirectories> <sourceDirectory>${project.basedir}/../proto</sourceDirectory> </sourceDirectories> @@ -186,8 +174,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <source>17</source> - <target>17</target> + <release>17</release> <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory> <includes> <include>${project.build.directory}/generated-sources/**/*.java</include> diff --git a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml index dc98654760..ff1d1ed4e8 100644 --- a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml +++ b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml @@ -14,7 +14,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.53</version> + <version>${jsch.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -24,7 +24,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> + <version>${commons-io.version}</version> </dependency> </dependencies> @@ -34,7 +34,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4.1</version> + <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 ae604de3f1..aa517ba0a0 100644 --- a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml +++ b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml @@ -25,6 +25,7 @@ <artifactId>agent-impl</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -34,7 +35,7 @@ <dependency> <groupId>com.hierynomus</groupId> <artifactId>sshj</artifactId> - <version>0.39.0</version> + <version>${sshj.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml index 44fae2519f..09dfe4909f 100644 --- a/modules/airavata-helix/helix-spectator/pom.xml +++ b/modules/airavata-helix/helix-spectator/pom.xml @@ -89,30 +89,19 @@ <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>services-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messaging-core</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java</artifactId> - <version>3.0.14</version> + <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> </dependency> </dependencies> diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml index 7ec6806547..da1db41afc 100644 --- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml +++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml @@ -41,18 +41,13 @@ <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-messaging-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-commons</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>metascheduler-core</artifactId> diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml index 9969b9982b..8b9a2829f9 100644 --- a/modules/airavata-metascheduler/metascheduler-core/pom.xml +++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml @@ -42,19 +42,13 @@ <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-messaging-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messaging-core</artifactId> - <version>0.21-SNAPSHOT</version> - <scope>compile</scope> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml index 71aa94c5e1..e4cb478e20 100644 --- a/modules/airavata-metascheduler/process-scheduler/pom.xml +++ b/modules/airavata-metascheduler/process-scheduler/pom.xml @@ -28,11 +28,6 @@ <artifactId>agent-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>agent-api</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>task-core</artifactId> @@ -43,20 +38,15 @@ <artifactId>airavata-orchestrator-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-orchestrator-core</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>helix-spectator</artifactId> - <version>0.21-SNAPSHOT</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml index 6c8dd5cdac..4a3528a851 100644 --- a/modules/cluster-monitoring/pom.xml +++ b/modules/cluster-monitoring/pom.xml @@ -55,17 +55,17 @@ <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz-jobs</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.50</version> + <version>${jsch.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -79,7 +79,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.3.1</version> + <version>${google.gson.version}</version> </dependency> </dependencies> diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index b5a393bcab..299b0eb097 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <version>${commons-dbcp.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -84,12 +84,12 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>7.0.22</version> + <version>${tomcat-embed-core.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${commons-cli.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -105,6 +105,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml index bd3b2cdd94..9332c06e70 100644 --- a/modules/compute-account-provisioning/pom.xml +++ b/modules/compute-account-provisioning/pom.xml @@ -45,13 +45,13 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.50</version> + <version>${jsch.version}</version> </dependency> <!-- apache directory ldap api! --> <dependency> <groupId>org.apache.directory.api</groupId> <artifactId>api-all</artifactId> - <version>1.0.0</version> + <version>${directory.api.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -61,7 +61,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.3.1</version> + <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 129a93aee5..78b58e66e9 100644 --- a/modules/computer-resource-monitoring-service/pom.xml +++ b/modules/computer-resource-monitoring-service/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.3.2</version> + <version>${quartz.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -49,13 +49,6 @@ <artifactId>metascheduler-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-commons</artifactId> - <version>0.21-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> <properties> diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml index 549f441ca1..062a2bcf16 100644 --- a/modules/credential-store/credential-store-service/pom.xml +++ b/modules/credential-store/credential-store-service/pom.xml @@ -64,8 +64,8 @@ <artifactId>oauth-consumer</artifactId> </exclusion> <exclusion> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> </exclusion> <exclusion> <groupId>postgresql</groupId> @@ -76,7 +76,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -111,7 +111,7 @@ <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <version>${commons-dbcp.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -121,23 +121,23 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.50</version> + <version>${jsch.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.3.2</version> + <version>${commons-email.version}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> + <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> + <version>${commons-io.version}</version> </dependency> </dependencies> <build> diff --git a/modules/credential-store/credential-store-stubs/pom.xml b/modules/credential-store/credential-store-stubs/pom.xml index 4a66dfd5e0..1be3effe02 100644 --- a/modules/credential-store/credential-store-stubs/pom.xml +++ b/modules/credential-store/credential-store-stubs/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.9</version> + <version>${commons-codec.version}</version> </dependency> </dependencies> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 788eca2aa7..ec7cef4dcc 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -61,22 +61,22 @@ <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> - <version>0.8.0</version> + <version>${jets3t.version}</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.2</version> + <version>${commons-collections.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.6</version> + <version>${commons-codec.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -171,7 +171,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <version>${commons-io.version}</version> </dependency> <!-- end Cloud module --> <dependency> @@ -191,7 +191,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> <dependency> <groupId>org.apache.openjpa</groupId> @@ -202,23 +202,23 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.2.1</version> + <version>${shiro-core.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> + <version>${javax.servlet-api.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-logging-juli</artifactId> - <version>7.0.22</version> + <version>${tomcat-embed-logging-juli.version}</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> - <version>7.0.22</version> + <version>${tomcat-embed-core.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -244,7 +244,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> + <version>${xerces.version}</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -255,28 +255,28 @@ <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>3.4.4</version> + <version>${icu4j.version}</version> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> - <version>1.1</version> + <version>${hamcrest.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.8.5</version> + <version>${mockito.version}</version> </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> - <version>1.7</version> + <version>${commons-configuration.version}</version> </dependency> <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> - <version>3.2</version> + <version>${jopt-simple.version}</version> </dependency> <dependency> <groupId>org.ebaysf.web</groupId> @@ -286,10 +286,8 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.53</version> + <version>${jsch.version}</version> </dependency> - <!-- dependency> <groupId>org.ogce</groupId> <artifactId>bcgss</artifactId> - <version>146</version> </dependency> --> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> @@ -322,6 +320,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -339,7 +341,7 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${commons-cli.version}</version> </dependency> <dependency> @@ -351,11 +353,23 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> <version>${kafka-clients.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -441,7 +455,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>unpack</id> @@ -733,7 +747,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.33.0</version> + <version>${docker-maven-plugin.version}</version> <configuration> <verbose>true</verbose> <images> diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml index 79c64aafae..16480d4656 100644 --- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml @@ -168,7 +168,7 @@ <include>*:*:jar</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java</exclude> + <exclude>com.mysql:mysql-connector-j</exclude> </excludes> </dependencySet> diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml index 767d8360e4..ff3919e8af 100644 --- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml @@ -86,8 +86,7 @@ <include>org.apache.airavata:airavata-server-configuration:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>commons-cli:commons-cli:jar</include> <include>commons-codec:commons-codec:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -133,7 +132,7 @@ <include>com.github.danielwegener:logback-kafka-appender:jar</include> <include>net.logstash.logback:logstash-logback-encoder:jar</include> <include>org.lz4:lz4-java:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>io.dropwizard.metrics:metrics-core:jar</include> <include>org.jboss.netty:netty:jar</include> <include>org.apache.openjpa:openjpa:jar</include> @@ -170,10 +169,9 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java:jar</exclude> + <exclude>com.mysql:mysql-connector-j:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml index 64400e89fb..116dc2245e 100644 --- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml @@ -92,8 +92,7 @@ <include>org.apache.airavata:airavata-data-models:jar</include> <include>org.apache.thrift:libthrift:jar</include> - <include>jakarta.mail:jakarta.mail-api:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>javax.activation:activation:jar</include> <include>org.yaml:snakeyaml:jar</include> @@ -130,7 +129,7 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> + <include>commons-lang:commons-lang:jar</include> </includes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml index 3a30e919e5..3374be8b95 100644 --- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml @@ -86,8 +86,7 @@ <include>org.apache.airavata:airavata-server-configuration:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>commons-cli:commons-cli:jar</include> <include>commons-codec:commons-codec:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -138,7 +137,7 @@ <include>com.github.danielwegener:logback-kafka-appender:jar</include> <include>net.logstash.logback:logstash-logback-encoder:jar</include> <include>org.lz4:lz4-java:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>io.dropwizard.metrics:metrics-core:jar</include> <include>org.jboss.netty:netty:jar</include> <include>org.apache.openjpa:openjpa:jar</include> @@ -168,10 +167,9 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java:jar</exclude> + <exclude>com.mysql:mysql-connector-j:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml index 5ea4d98327..1fd4fa32e9 100644 --- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml @@ -88,8 +88,7 @@ <include>org.apache.airavata:profile-service-stubs:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>commons-cli:commons-cli:jar</include> <include>commons-codec:commons-codec:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -139,7 +138,7 @@ <include>com.github.danielwegener:logback-kafka-appender:jar</include> <include>net.logstash.logback:logstash-logback-encoder:jar</include> <include>org.lz4:lz4-java:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>io.dropwizard.metrics:metrics-core:jar</include> <include>org.jboss.netty:netty:jar</include> <include>org.apache.openjpa:openjpa:jar</include> @@ -178,7 +177,7 @@ <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</include> <include>org.glassfish.jersey.connectors:jersey-apache-connector:jar</include> <include>org.glassfish.jersey.core:jersey-common:jar</include> - <include>javax.annotation:javax.annotation-api:jar</include> + <include>jakarta.annotation:jakarta.annotation-api:jar</include> <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</include> <include>org.glassfish.hk2:osgi-resource-locator:jar</include> <include>org.apache.httpcomponents:httpcore:jar</include> @@ -193,12 +192,10 @@ <include>com.kohlschutter.junixsocket:junixsocket-native-common:jar</include> <include>org.scijava:native-lib-loader:jar</include> <include>org.apache.commons:commons-compress:jar</include> - <include>commons-lang:commons-lang:jar</include> <include>commons-io:commons-io:jar</include> <include>org.slf4j:jcl-over-slf4j:jar</include> <include>com.google.guava:guava:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>io.netty:netty-codec-http:jar</include> <include>io.netty:netty-codec:jar</include> <include>io.netty:netty-handler:jar</include> @@ -219,10 +216,9 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java:jar</exclude> + <exclude>com.mysql:mysql-connector-j:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml index 6dab1016dd..5e179aa199 100644 --- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml @@ -86,8 +86,7 @@ <include>org.apache.airavata:airavata-server-configuration:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>commons-cli:commons-cli:jar</include> <include>commons-codec:commons-codec:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -139,7 +138,7 @@ <include>net.logstash.logback:logstash-logback-encoder:jar</include> <include>org.lz4:lz4-java:jar</include> <include>io.dropwizard.metrics:metrics-core:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>org.jboss.netty:netty:jar</include> <include>org.apache.openjpa:openjpa:jar</include> <include>org.apache.airavata:platform-monitor:jar</include> @@ -174,10 +173,9 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java:jar</exclude> + <exclude>com.mysql:mysql-connector-j:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml index d6b0e9ae5e..8ac2782c03 100644 --- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml @@ -86,8 +86,7 @@ <include>org.apache.airavata:airavata-server-configuration:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> - <include>org.bouncycastle:bcpkix-jdk15on:jar</include> - <include>org.bouncycastle:bcprov-jdk15on:jar</include> + <include>org.bouncycastle:bcpkix-jdk18on:jar</include> <include>commons-cli:commons-cli:jar</include> <include>commons-codec:commons-codec:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -138,7 +137,7 @@ <include>com.github.danielwegener:logback-kafka-appender:jar</include> <include>net.logstash.logback:logstash-logback-encoder:jar</include> <include>org.lz4:lz4-java:jar</include> - <include>jakarta.mail:jakarta.mail:jar</include> + <include>org.eclipse.angus:jakarta.mail:jar</include> <include>io.dropwizard.metrics:metrics-core:jar</include> <include>org.jboss.netty:netty:jar</include> <include>org.apache.openjpa:openjpa:jar</include> @@ -173,10 +172,9 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> </includes> <excludes> - <exclude>mysql:mysql-connector-java:jar</exclude> + <exclude>com.mysql:mysql-connector-j:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml index 80a567b854..0d32b253cd 100644 --- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml @@ -123,7 +123,7 @@ <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> - <include>org.apache.commons:commons-lang3</include> + <include>commons-lang:commons-lang:jar</include> </includes> </dependencySet> </dependencySets> diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml index 4a3fe4363c..c17589d0dd 100644 --- a/modules/file-server/pom.xml +++ b/modules/file-server/pom.xml @@ -49,6 +49,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml index 1b8162b6d5..67b5c10d39 100644 --- a/modules/ide-integration/pom.xml +++ b/modules/ide-integration/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.0.2</version> + <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 b4546339f5..09c5166017 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 @@ -6,7 +6,7 @@ <groupId>org.apache.airavata.pga.tests</groupId> <artifactId>PGATest</artifactId> <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> <name>PGATest</name> <build> <plugins> @@ -15,15 +15,13 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <!--<source>17</source>--> - <!--<target>17</target>--> <release>17</release> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <includes> <include>**/RunAllTests.java</include> @@ -58,7 +56,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> - <version>2.3</version> + <version>${selenium-maven-plugin.version}</version> <!--executions> <execution> <phase>pre-integration-test</phase> @@ -74,23 +72,16 @@ </plugins> </build> <dependencies> - <!--dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency--> <dependency> <groupId>org.seleniumhq.selenium.client-drivers</groupId> <artifactId>selenium-java-client-driver</artifactId> - <version>1.0.1</version> + <version>${selenium-java-client-driver.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-firefox-driver</artifactId> - <version>2.44.0</version> + <version>${selenium-firefox-driver.version}</version> </dependency> <dependency> @@ -101,38 +92,38 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.3.2</version> + <version>${httpclient.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>${commons-io.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.1</version> + <version>${commons-exec.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>${commons-logging.version}</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-remote-driver</artifactId> - <version>2.44.0</version> + <version>${selenium-remote-driver.version}</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.44.0</version> + <version>${selenium-java.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.2</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml index ac66537f89..2d7f8eba98 100644 --- a/modules/job-monitor/email-monitor/pom.xml +++ b/modules/job-monitor/email-monitor/pom.xml @@ -24,6 +24,7 @@ <artifactId>job-monitor</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -41,9 +42,9 @@ <artifactId>snakeyaml</artifactId> </dependency> <dependency> - <groupId>jakarta.mail</groupId> - <artifactId>jakarta.mail-api</artifactId> - <version>2.1.2</version> + <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 4ba08208fb..28b880aa35 100644 --- a/modules/job-monitor/job-monitor-api/pom.xml +++ b/modules/job-monitor/job-monitor-api/pom.xml @@ -24,6 +24,7 @@ <artifactId>job-monitor</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -33,7 +34,7 @@ <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-commons</artifactId> - <version>${project.version}</version> + <version>0.21-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml index 8a62fcc7b2..74ad530e72 100644 --- a/modules/job-monitor/pom.xml +++ b/modules/job-monitor/pom.xml @@ -41,12 +41,12 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.15</version> + <version>${snakeyaml.version}</version> </dependency> <dependency> - <groupId>jakarta.mail</groupId> - <artifactId>jakarta.mail-api</artifactId> - <version>2.1.2</version> + <groupId>org.eclipse.angus</groupId> + <artifactId>jakarta.mail</artifactId> + <version>${jakarta.mail.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml index 0c4aed1455..04a54b3ea2 100644 --- a/modules/messaging/client/pom.xml +++ b/modules/messaging/client/pom.xml @@ -71,6 +71,7 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>${maven.assembly.plugin}</version> <configuration> <archive> <manifest> diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index 358f4d4e6a..e8d54953f6 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -87,7 +87,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.1.1</version> + <version>${testng.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml index ff15cf3fe9..c8fa5f3f6c 100644 --- a/modules/orchestrator/orchestrator-service/pom.xml +++ b/modules/orchestrator/orchestrator-service/pom.xml @@ -97,14 +97,6 @@ <artifactId>computer-resource-monitoring-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>metadata-analyzer</artifactId> - <version>0.21-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - </dependencies> <properties> diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml index 80aa5d6c63..75725ab0b6 100644 --- a/modules/platform-monitoring/pom.xml +++ b/modules/platform-monitoring/pom.xml @@ -37,25 +37,25 @@ <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient</artifactId> - <version>0.9.0</version> + <version>${prometheus.version}</version> </dependency> <!-- Hotspot JVM metrics--> <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient_hotspot</artifactId> - <version>0.9.0</version> + <version>${prometheus.version}</version> </dependency> <!-- Exposition HTTPServer--> <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient_httpserver</artifactId> - <version>0.9.0</version> + <version>${prometheus.version}</version> </dependency> <!-- Pushgateway exposition--> <dependency> <groupId>io.prometheus</groupId> - <artifactId>simpleclient_pushgateway</artifactId> - <version>0.9.0</version> + <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 0634e28f6f..558ffc6b4e 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -55,6 +55,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -64,8 +68,8 @@ </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> <version>${mysql.connector.version}</version> </dependency> <dependency> @@ -91,7 +95,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -112,13 +116,13 @@ <dependency> <groupId>org.apache.ibatis</groupId> <artifactId>ibatis-sqlmap</artifactId> - <version>2.3.0</version> + <version>${ibatis-sqlmap.version}</version> </dependency> <!-- For MariaDB based schema migrations --> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.0.2</version> + <version>${mariadb-java-client.version}</version> <scope>runtime</scope> </dependency> </dependencies> @@ -140,7 +144,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> + <version>${exec-maven-plugin.version}</version> <configuration> <executable>java</executable> <classpathScope>runtime</classpathScope> @@ -259,7 +263,7 @@ <plugin> <groupId>com.dkanejs.maven.plugins</groupId> <artifactId>docker-compose-maven-plugin</artifactId> - <version>4.0.0</version> + <version>${docker-compose-maven-plugin.version}</version> <executions> <execution> <id>mysql-up</id> diff --git a/modules/registry/registry-server/registry-api-service/pom.xml b/modules/registry/registry-server/registry-api-service/pom.xml index 4551aeca86..d335027f3d 100644 --- a/modules/registry/registry-server/registry-api-service/pom.xml +++ b/modules/registry/registry-server/registry-api-service/pom.xml @@ -25,6 +25,7 @@ <artifactId>registry-server</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/registry/registry-server/registry-api-stubs/pom.xml b/modules/registry/registry-server/registry-api-stubs/pom.xml index e9ed2bd6b3..ac640759b5 100644 --- a/modules/registry/registry-server/registry-api-stubs/pom.xml +++ b/modules/registry/registry-server/registry-api-stubs/pom.xml @@ -25,6 +25,7 @@ <artifactId>registry-server</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/registry/registry-tools/registry-tool/pom.xml b/modules/registry/registry-tools/registry-tool/pom.xml index 08e923de1d..bd2a982793 100644 --- a/modules/registry/registry-tools/registry-tool/pom.xml +++ b/modules/registry/registry-tools/registry-tool/pom.xml @@ -37,22 +37,22 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.9.1.0</version> + <version>${derby.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbyclient</artifactId> - <version>10.9.1.0</version> + <version>${derby.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbynet</artifactId> - <version>10.9.1.0</version> + <version>${derby.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbytools</artifactId> - <version>10.9.1.0</version> + <version>${derby.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -61,7 +61,7 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.1</version> + <version>${commons-cli.version}</version> </dependency> </dependencies> </project> diff --git a/modules/security/pom.xml b/modules/security/pom.xml index 8df7b7634c..a6f4c968b1 100644 --- a/modules/security/pom.xml +++ b/modules/security/pom.xml @@ -42,17 +42,17 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.2.1</version> + <version>${shiro-core.version}</version> </dependency> <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <version>${commons-dbcp.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/modules/server/pom.xml b/modules/server/pom.xml index ad569d05d4..d0869323a3 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -39,8 +39,6 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <!--<source>17</source>--> - <!--<target>17</target>--> <release>17</release> </configuration> </plugin> @@ -50,7 +48,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index 69fac6e8ef..e232b46619 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -25,6 +25,7 @@ <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -39,15 +40,13 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <!--<source>17</source>--> - <!--<target>17</target>--> <release>17</release> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> + <version>${exec-maven-plugin.version}</version> <executions> <execution> <goals> @@ -97,7 +96,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.3</version> + <version>${thrift.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -112,7 +111,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.0.2</version> + <version>${mariadb-java-client.version}</version> </dependency> </dependencies> </project> diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml index c588815286..aa5983f12b 100644 --- a/modules/sharing-registry/sharing-registry-distribution/pom.xml +++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml @@ -25,6 +25,7 @@ <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -48,6 +49,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -56,8 +61,8 @@ <version>${openjpa.version}</version> </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> <version>${mysql.connector.version}</version> </dependency> <dependency> diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index 411552b2c7..b03624c8d9 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -59,6 +59,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -67,8 +71,8 @@ <version>${openjpa.version}</version> </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> <version>${mysql.connector.version}</version> </dependency> <dependency> @@ -79,7 +83,7 @@ <dependency> <groupId>org.databene</groupId> <artifactId>contiperf</artifactId> - <version>2.3.4</version> + <version>${contiperf.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> @@ -89,7 +93,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>${commons.lang.version}</version> + <version>${commons-lang.version}</version> </dependency> @@ -103,18 +107,12 @@ <version>${maven.compiler.plugin.version}</version> <configuration> <release>17</release> - <source>17</source> - <target>17</target> - <!--<compilerArgs>--> - <!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>--> - <!--</compilerArgs>--> - <!--<fork>true</fork>--> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.2</version> + <version>${maven-jar-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.openjpa</groupId> diff --git a/pom.xml b/pom.xml index a0d5df6dc4..3fdd984a36 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,6 @@ <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> @@ -111,11 +107,11 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <derby.version>10.13.1.1</derby.version> <org.slf4j.version>2.0.16</org.slf4j.version> - <log4j2.slf4j.impl>2.24.0</log4j2.slf4j.impl> - <log4j2.version>2.24.0</log4j2.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.12</junit.version> - <curator.version>5.7.0</curator.version> + <junit.version>4.13.1</junit.version> + <curator.version>5.6.0</curator.version> <groovy.version>3.0.23</groovy.version> <xpp3.version>1.1.6</xpp3.version> <xpp5.version>1.2.8</xpp5.version> @@ -126,47 +122,116 @@ <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>1.1.3</oa4mp.version> + <oa4mp.version>4.3</oa4mp.version> <antrun.version>1.8</antrun.version> - <bouncy.castle.version>1.70</bouncy.castle.version> + <bouncy.castle.version>1.78</bouncy.castle.version> <ebay.cors.filter>1.0.0</ebay.cors.filter> - <thrift.version>0.18.1</thrift.version> - <mysql.connector.version>8.0.31</mysql.connector.version> + <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.2</zk.version> - <amqp.client.version>3.5.1</amqp.client.version> - <snakeyaml.version>1.15</snakeyaml.version> + <amqp.client.version>4.12.0</amqp.client.version> + <snakeyaml.version>2.2</snakeyaml.version> <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <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>1.0.0</kafka-clients.version> - <json.version>20160212</json.version> - <commons.io.version>2.11.0</commons.io.version> + <kafka-clients.version>3.7.1</kafka-clients.version> + <json.version>20250107</json.version> <google.guava.version>33.2.1-jre</google.guava.version> <jacoco.version>0.8.1</jacoco.version> <openjpa.maven.plugin.version>4.0.1</openjpa.maven.plugin.version> <openjpa.version>4.0.1</openjpa.version> <dozer.version>5.4.0</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> + <angus-activation.version>2.0.2</angus-activation.version> <jaxb.version>2.4.0-b180830.0359</jaxb.version> <jmockit.version>1.44</jmockit.version> - <commons.lang.version>2.6</commons.lang.version> - <org.apache.commons.pool2.version>2.7.0</org.apache.commons.pool2.version> - <helix.version>0.9.7</helix.version> + <helix.version>1.4.3</helix.version> <keycloak.admin.client.version>24.0.4</keycloak.admin.client.version> - <rest.easy.client.version>6.2.12.Final</rest.easy.client.version> + <resteasy.version>6.2.12.Final</resteasy.version> <httpclient.version>4.5.14</httpclient.version> + <httpcore.version>4.4.16</httpcore.version> + <httpcore.version>4.4.16</httpcore.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <spring.boot.version>3.2.4</spring.boot.version> + <aopalliance.version>1.0</aopalliance.version> + <oltu.oauth2.client.version>1.0.0</oltu.oauth2.client.version> + <jsch.version>0.1.54</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>1.6.0</exec-maven-plugin.version> + <grpc-server-spring-boot-starter.version>3.1.0.RELEASE</grpc-server-spring-boot-starter.version> + <commons-beanutils.version>1.9.2</commons-beanutils.version> + <commons-io.version>2.18.0</commons-io.version> + <commons-pool2.version>2.12.1</commons-pool2.version> + <commons-pool.version>1.6</commons-pool.version> + <commons-dbcp.version>1.4</commons-dbcp.version> + <commons-cli.version>1.9.0</commons-cli.version> + <commons-email.version>1.5</commons-email.version> + <commons-codec.version>1.18.0</commons-codec.version> + <commons-collections.version>3.2.2</commons-collections.version> + <commons-lang.version>2.6</commons-lang.version> + <commons-lang3.version>3.12.0</commons-lang3.version> + <commons-configuration.version>1.10</commons-configuration.version> + <commons-exec.version>1.4.0</commons-exec.version> + <commons-logging.version>1.3.5</commons-logging.version> + <docker-maven-plugin.version>0.33.0</docker-maven-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> + <keycloak.authz.client.version>24.0.4</keycloak.authz.client.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.9.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.1.113.Final</netty.version> + <logback.version>1.4.14</logback.version> + <!-- From Agent Service --> + <protobuf-java.version>3.25.5</protobuf-java.version> + <protobuf-maven-plugin.version>2.12.1</protobuf-maven-plugin.version> + <grpc.version>1.63.0</grpc.version> + <j2objc-annotations.version>2.8</j2objc-annotations.version> </properties> <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${org.slf4j.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -188,6 +253,51 @@ <dependencyManagement> <dependencies> + <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> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-core</artifactId> + <version>${resteasy.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-core-spi</artifactId> + <version>${resteasy.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jackson2-provider</artifactId> + <version>${resteasy.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-client</artifactId> + <version>${resteasy.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${org.slf4j.version}</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -223,14 +333,24 @@ <artifactId>junit</artifactId> <version>${junit.version}</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> + </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> <version>${bouncy.castle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> + <artifactId>bcpkix-jdk18on</artifactId> <version>${bouncy.castle.version}</version> </dependency> <dependency> @@ -268,10 +388,90 @@ <artifactId>guava</artifactId> <version>${google.guava.version}</version> </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbynet</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${codehaus.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons-cli.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>${commons-pool.version}</version> + </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-pool2</artifactId> - <version>${org.apache.commons.pool2.version}</version> + <version>${commons-pool2.version}</version> </dependency> <dependency> <groupId>org.jmockit</groupId> @@ -279,6 +479,126 @@ <version>${jmockit.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${json.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>${jackson-core-asl.version}</version> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>${snappy-java.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <version>${os.detected.classifier}:${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation.version}</version> + </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>${jakarta.activation-api.version}</version> + </dependency> + <dependency> + <groupId>com.github.docker-java</groupId> + <artifactId>docker-java</artifactId> + <version>${docker-java.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${fasterxml.jackson.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>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <version>${mysql.connector.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <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>angus-activation</artifactId> + <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> + </dependency> </dependencies> </dependencyManagement> @@ -287,7 +607,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>templating-maven-plugin</artifactId> - <version>1.0.0</version> + <version>${templating.maven.version}</version> <executions> <execution> <phase>process-resources</phase> @@ -348,16 +668,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> <configuration> - <source>17</source> - <target>17</target> - <!--</configuration>--> - <!--<!–<version>3.8.0</version>–>--> - <!--<configuration>--> - - <!--<compilerArgs>--> - <!--<arg>--add-exports=java.base/sun.security=ALL-UNNAMED</arg>--> - <!--</compilerArgs>--> - <!--<release>17</release>--> + <release>17</release> <fork>true</fork> </configuration> @@ -395,7 +706,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M1</version> + <version>${maven-enforcer-plugin.version}</version> <executions> <execution> <id>enforce-versions</id> @@ -404,9 +715,8 @@ </goals> <configuration> <rules> - <requireMavenVersion> - <version>3.0</version> - </requireMavenVersion> +<!-- <requireUpperBoundDeps/>--> + <dependencyConvergence/> </rules> </configuration> </execution> diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml index 3d880b001a..2eca594a3d 100644 --- a/tools/load-client/pom.xml +++ b/tools/load-client/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>${rest.easy.client.version}</version> + <version>${resteasy.version}</version> </dependency> <dependency> <groupId>org.keycloak</groupId> @@ -43,17 +43,17 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.15</version> + <version>${snakeyaml.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${commons-cli.version}</version> </dependency> <dependency> <groupId>org.keycloak</groupId> <artifactId>keycloak-authz-client</artifactId> - <version>2.5.4.Final</version> + <version>${keycloak.authz.client.version}</version> </dependency> </dependencies> <build> @@ -61,7 +61,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.3.0</version> + <version>${maven.assembly.plugin}</version> <executions> <execution> <id>load-client-distribution-package</id>
