Skip to content

Commit 6ec7398

Browse files
committed
Switched to new parent pom and solve Spring dependency clashes
1 parent be1afc4 commit 6ec7398

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

modules/spring-module/pom.xml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<!--suppress MavenPropertyInParent -->
1110
<version>8.8.3</version>
1211
<relativePath>../../</relativePath>
1312
</parent>
@@ -36,19 +35,16 @@
3635
<dependency>
3736
<groupId>org.springframework</groupId>
3837
<artifactId>spring-core</artifactId>
39-
<version>${spring.version}</version>
4038
<scope>provided</scope>
4139
</dependency>
4240
<dependency>
4341
<groupId>org.springframework</groupId>
4442
<artifactId>spring-context</artifactId>
45-
<version>${spring.version}</version>
4643
<scope>provided</scope>
4744
</dependency>
4845
<dependency>
4946
<groupId>org.springframework</groupId>
5047
<artifactId>spring-beans</artifactId>
51-
<version>${spring.version}</version>
5248
<scope>provided</scope>
5349
</dependency>
5450

@@ -58,36 +54,34 @@
5854
<artifactId>spring-boot-configuration-processor</artifactId>
5955
<optional>true</optional>
6056
<version>${spring.boot.version}</version>
61-
<exclusions>
62-
<exclusion>
63-
<groupId>org.springframework</groupId>
64-
<artifactId>*</artifactId>
65-
</exclusion>
66-
</exclusions>
6757
</dependency>
6858
<dependency>
6959
<groupId>org.springframework.boot</groupId>
7060
<artifactId>spring-boot-autoconfigure</artifactId>
7161
<optional>true</optional>
7262
<version>${spring.boot.version}</version>
73-
<exclusions>
74-
<exclusion>
75-
<groupId>org.springframework</groupId>
76-
<artifactId>*</artifactId>
77-
</exclusion>
78-
</exclusions>
7963
</dependency>
8064

81-
8265
<!-- spring testing -->
8366
<dependency>
8467
<groupId>org.springframework</groupId>
8568
<artifactId>spring-test</artifactId>
86-
<version>${spring.version}</version>
8769
<scope>test</scope>
8870
</dependency>
8971
</dependencies>
9072

73+
<dependencyManagement>
74+
<dependencies>
75+
<dependency>
76+
<groupId>org.springframework</groupId>
77+
<artifactId>spring-framework-bom</artifactId>
78+
<version>${spring.version}</version>
79+
<type>pom</type>
80+
<scope>import</scope>
81+
</dependency>
82+
</dependencies>
83+
</dependencyManagement>
84+
9185
<build>
9286
<plugins>
9387
<plugin>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.bbottema</groupId>
88
<artifactId>modular-project-parent</artifactId>
9-
<version>1.0.28</version>
9+
<version>1.0.30</version>
1010
</parent>
1111

1212
<groupId>org.simplejavamail</groupId>

0 commit comments

Comments
 (0)