This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 96de191b0 [MAINTENANCE] Group spring version properties
96de191b0 is described below
commit 96de191b090a6972f5300d3d10b14b5082b4499a
Author: Dominik Przybysz <[email protected]>
AuthorDate: Fri Jan 17 18:41:33 2025 +0100
[MAINTENANCE] Group spring version properties
---
blueprint/blueprint-spring/pom.xml | 13 +++++--------
transaction/transaction-manager/pom.xml | 4 ++--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/blueprint/blueprint-spring/pom.xml
b/blueprint/blueprint-spring/pom.xml
index 82a1f64a1..28059f1a7 100644
--- a/blueprint/blueprint-spring/pom.xml
+++ b/blueprint/blueprint-spring/pom.xml
@@ -71,10 +71,7 @@
<org.apache.felix.utils.version>1.11.6</org.apache.felix.utils.version>
<pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version>
<slf4j.version>1.7.5</slf4j.version>
- <spring-aop.version>4.2.2.RELEASE</spring-aop.version>
- <spring-beans.version>4.2.2.RELEASE</spring-beans.version>
- <spring-context.version>4.2.2.RELEASE</spring-context.version>
- <spring-tx.version>4.2.2.RELEASE</spring-tx.version>
+ <spring.version>4.2.2.RELEASE</spring.version>
</properties>
<profiles>
@@ -130,13 +127,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring-context.version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring-beans.version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -189,13 +186,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring-tx.version}</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring-aop.version}</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/transaction/transaction-manager/pom.xml
b/transaction/transaction-manager/pom.xml
index 575271d4a..93a57786c 100644
--- a/transaction/transaction-manager/pom.xml
+++ b/transaction/transaction-manager/pom.xml
@@ -76,7 +76,7 @@
<junit.version>4.13.2</junit.version>
<maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
<maven-shade-plugin.version>1.1</maven-shade-plugin.version>
- <spring-tx.version>2.5.6</spring-tx.version>
+ <spring.version>2.5.6</spring.version>
</properties>
<dependencies>
@@ -106,7 +106,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<optional>true</optional>
- <version>${spring-tx.version}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>