This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 59c4a0523f build: centralize dependency versions and drop redundant
config (#632)
59c4a0523f is described below
commit 59c4a0523fd0ce123759368f8d90e4ce49e75904
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sun Jun 7 18:35:17 2026 -0400
build: centralize dependency versions and drop redundant config (#632)
Hoists the Mockito (5.23.0) and MapStruct (now a mapstruct.version
property) versions into the root pom so the modules stop repeating them — which
also aligns airavata-server's test Mockito (previously 5.17.0 from the Spring
Boot BOM) with the rest — removes the four spring-boot-starter version pins and
the misplaced spring-boot-maven-plugin entry from dependencyManagement (all
already supplied by the imported spring-boot-dependencies BOM), and bumps the
spring-boot-maven-plugin plugi [...]
---
airavata-api/compute-service/pom.xml | 4 +--
airavata-api/credential-service/pom.xml | 4 +--
airavata-api/iam-service/pom.xml | 2 --
airavata-api/orchestration-service/pom.xml | 4 +--
airavata-api/pom.xml | 4 +--
airavata-api/research-service/pom.xml | 4 +--
airavata-api/sharing-service/pom.xml | 2 --
airavata-api/storage-service/pom.xml | 2 --
airavata-server/pom.xml | 2 +-
pom.xml | 46 ++++++++++--------------------
10 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/airavata-api/compute-service/pom.xml
b/airavata-api/compute-service/pom.xml
index 20e5fe2df7..f186082bdc 100644
--- a/airavata-api/compute-service/pom.xml
+++ b/airavata-api/compute-service/pom.xml
@@ -78,13 +78,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -156,7 +154,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/airavata-api/credential-service/pom.xml
b/airavata-api/credential-service/pom.xml
index 354ce0fdbb..3702150c07 100644
--- a/airavata-api/credential-service/pom.xml
+++ b/airavata-api/credential-service/pom.xml
@@ -75,13 +75,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,7 +118,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/airavata-api/iam-service/pom.xml b/airavata-api/iam-service/pom.xml
index a623bb9dd9..c12072c9ef 100644
--- a/airavata-api/iam-service/pom.xml
+++ b/airavata-api/iam-service/pom.xml
@@ -72,13 +72,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/airavata-api/orchestration-service/pom.xml
b/airavata-api/orchestration-service/pom.xml
index ff4356777a..4d79315590 100644
--- a/airavata-api/orchestration-service/pom.xml
+++ b/airavata-api/orchestration-service/pom.xml
@@ -112,13 +112,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -184,7 +182,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index 1ee60ca5ca..c0fcf03cc3 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -107,13 +107,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -336,7 +334,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/airavata-api/research-service/pom.xml
b/airavata-api/research-service/pom.xml
index 5a12ed4769..6a5e040495 100644
--- a/airavata-api/research-service/pom.xml
+++ b/airavata-api/research-service/pom.xml
@@ -107,13 +107,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -178,7 +176,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/airavata-api/sharing-service/pom.xml
b/airavata-api/sharing-service/pom.xml
index b352d71bbf..e70dc6c760 100644
--- a/airavata-api/sharing-service/pom.xml
+++ b/airavata-api/sharing-service/pom.xml
@@ -60,13 +60,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/airavata-api/storage-service/pom.xml
b/airavata-api/storage-service/pom.xml
index 67d61a4d71..d26d75f1e6 100644
--- a/airavata-api/storage-service/pom.xml
+++ b/airavata-api/storage-service/pom.xml
@@ -83,13 +83,11 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.23.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/airavata-server/pom.xml b/airavata-server/pom.xml
index b2f8041924..5a70c73d9b 100644
--- a/airavata-server/pom.xml
+++ b/airavata-server/pom.xml
@@ -186,7 +186,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
diff --git a/pom.xml b/pom.xml
index 85626ced23..93f3824a85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@ under the License.
<skipTests>false</skipTests>
<surefire.excludedGroups>integration |
runtime</surefire.excludedGroups>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+ <mapstruct.version>1.6.3</mapstruct.version>
</properties>
<dependencies>
@@ -128,6 +129,16 @@ under the License.
<artifactId>junit-platform-launcher</artifactId>
<version>1.12.2</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.23.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>5.23.0</version>
+ </dependency>
<!-- Testcontainers BOM -->
<dependency>
<groupId>org.testcontainers</groupId>
@@ -332,43 +343,16 @@ under the License.
<version>1.81</version>
</dependency>
- <!-- Spring Boot -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>3.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>3.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- <version>3.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- <version>3.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.5.12</version>
- </dependency>
-
<!-- MapStruct -->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</dependency>
<!-- gRPC -->
@@ -497,7 +481,7 @@ under the License.
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>1.6.3</version>
+ <version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
@@ -668,7 +652,7 @@ under the License.
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.5.3</version>
+ <version>3.5.12</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
