Skip to content

Commit 9245ba0

Browse files
amit2103pivovarit
amit2103
authored and
pivovarit
committed
Bael 6729 (eugenp#4389)
* Added parent module on poms that have no parent defined * Removed dependency reduced pom from undertow module * Added README * [BAEL-6729] - Spring modules needs a spring parent * [BAEL-6729] - Spring modules needs a spring parent
1 parent 9c26833 commit 9245ba0

File tree

43 files changed

+236
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+236
-306
lines changed

‎cdi/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<parent>
1010
<groupId>com.baeldung</groupId>
11-
<artifactId>parent-spring</artifactId>
11+
<artifactId>parent-spring-4</artifactId>
1212
<version>0.0.1-SNAPSHOT</version>
13-
<relativePath>../parent-spring</relativePath>
13+
<relativePath>../parent-spring-4</relativePath>
1414
</parent>
1515

1616
<dependencies>
@@ -38,7 +38,6 @@
3838
</dependencies>
3939

4040
<properties>
41-
<spring.version>4.3.4.RELEASE</spring.version>
4241
<aspectjweaver.version>1.8.9</aspectjweaver.version>
4342
<weld-se-core.version>2.4.1.Final</weld-se-core.version>
4443
</properties>

‎drools/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>com.baeldung</groupId>
9-
<artifactId>parent-spring</artifactId>
9+
<artifactId>parent-spring-4</artifactId>
1010
<version>0.0.1-SNAPSHOT</version>
11-
<relativePath>../parent-spring</relativePath>
11+
<relativePath>../parent-spring-4</relativePath>
1212
</parent>
1313

1414
<dependencies>
@@ -54,7 +54,6 @@
5454
<http-component-version>4.4.6</http-component-version>
5555
<drools-version>7.4.1.Final</drools-version>
5656
<apache-poi-version>3.13</apache-poi-version>
57-
<spring.version>4.3.6.RELEASE</spring.version>
5857
</properties>
5958

6059
</project>

‎handling-spring-static-resources/pom.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-spring</artifactId>
13+
<artifactId>parent-spring-4</artifactId>
1414
<version>0.0.1-SNAPSHOT</version>
15-
<relativePath>../parent-spring</relativePath>
15+
<relativePath>../parent-spring-4</relativePath>
1616
</parent>
1717

1818
<dependencies>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.springframework</groupId>
3939
<artifactId>spring-core</artifactId>
40-
<version>${org.springframework.version}</version>
40+
<version>${spring.version}</version>
4141
<exclusions>
4242
<exclusion>
4343
<artifactId>commons-logging</artifactId>
@@ -48,43 +48,43 @@
4848
<dependency>
4949
<groupId>org.springframework</groupId>
5050
<artifactId>spring-context</artifactId>
51-
<version>${org.springframework.version}</version>
51+
<version>${spring.version}</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.springframework</groupId>
5555
<artifactId>spring-jdbc</artifactId>
56-
<version>${org.springframework.version}</version>
56+
<version>${spring.version}</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.springframework</groupId>
6060
<artifactId>spring-beans</artifactId>
61-
<version>${org.springframework.version}</version>
61+
<version>${spring.version}</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.springframework</groupId>
6565
<artifactId>spring-aop</artifactId>
66-
<version>${org.springframework.version}</version>
66+
<version>${spring.version}</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.springframework</groupId>
7070
<artifactId>spring-tx</artifactId>
71-
<version>${org.springframework.version}</version>
71+
<version>${spring.version}</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.springframework</groupId>
7575
<artifactId>spring-expression</artifactId>
76-
<version>${org.springframework.version}</version>
76+
<version>${spring.version}</version>
7777
</dependency>
7878

7979
<dependency>
8080
<groupId>org.springframework</groupId>
8181
<artifactId>spring-web</artifactId>
82-
<version>${org.springframework.version}</version>
82+
<version>${spring.version}</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.springframework</groupId>
8686
<artifactId>spring-webmvc</artifactId>
87-
<version>${org.springframework.version}</version>
87+
<version>${spring.version}</version>
8888
</dependency>
8989

9090
<!-- AOP -->
@@ -190,8 +190,7 @@
190190
<java-version>1.8</java-version>
191191

192192
<!-- Spring -->
193-
<org.springframework.version>4.3.4.RELEASE</org.springframework.version>
194-
<org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
193+
<org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
195194

196195
<org.aspectj-version>1.8.9</org.aspectj-version>
197196
<javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>

‎logging-modules/log-mdc/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-spring</artifactId>
13+
<artifactId>parent-spring-4</artifactId>
1414
<version>0.0.1-SNAPSHOT</version>
15-
<relativePath>../../parent-spring</relativePath>
15+
<relativePath>../../parent-spring-4</relativePath>
1616
</parent>
1717

1818
<dependencies>
@@ -80,7 +80,6 @@
8080
</dependencies>
8181

8282
<properties>
83-
<spring.version>4.3.4.RELEASE</spring.version>
8483
<log4j.version>1.2.17</log4j.version>
8584
<log4j2.version>2.7</log4j2.version>
8685
<disruptor.version>3.3.6</disruptor.version>

parent-spring/README.md renamed to parent-spring-4/README.md

File renamed without changes.

‎parent-spring-4/pom.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.baeldung</groupId>
5+
<artifactId>parent-spring-4</artifactId>
6+
<version>0.0.1-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
<name>parent-spring-4</name>
9+
<description>Parent for all spring 4 core modules</description>
10+
11+
<parent>
12+
<groupId>com.baeldung</groupId>
13+
<artifactId>parent-modules</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
15+
</parent>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.springframework</groupId>
20+
<artifactId>spring-core</artifactId>
21+
<version>${spring.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.junit.jupiter</groupId>
25+
<artifactId>junit-jupiter-engine</artifactId>
26+
<version>${junit.jupiter.version}</version>
27+
<scope>test</scope>
28+
</dependency>
29+
</dependencies>
30+
31+
<properties>
32+
<spring.version>4.3.17.RELEASE</spring.version>
33+
<junit.jupiter.version>5.0.2</junit.jupiter.version>
34+
</properties>
35+
36+
</project>

‎parent-spring-5/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Relevant articles:

parent-spring/pom.xml renamed to parent-spring-5/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.baeldung</groupId>
5-
<artifactId>parent-spring</artifactId>
5+
<artifactId>parent-spring-5</artifactId>
66
<version>0.0.1-SNAPSHOT</version>
77
<packaging>pom</packaging>
8-
<name>parent-spring</name>
9-
<description>Parent for all spring core modules</description>
8+
<name>parent-spring-5</name>
9+
<description>Parent for all spring 5 core modules</description>
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
@@ -29,7 +29,7 @@
2929
</dependencies>
3030

3131
<properties>
32-
<spring.version>4.3.6.RELEASE</spring.version>
32+
<spring.version>5.0.6.RELEASE</spring.version>
3333
<junit.jupiter.version>5.0.2</junit.jupiter.version>
3434
</properties>
3535

‎persistence-modules/spring-data-cassandra/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-spring</artifactId>
12+
<artifactId>parent-spring-4</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../../parent-spring</relativePath>
14+
<relativePath>../../parent-spring-4</relativePath>
1515
</parent>
1616

1717
<dependencies>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.springframework</groupId>
2525
<artifactId>spring-core</artifactId>
26-
<version>${org.springframework.version}</version>
26+
<version>${spring.version}</version>
2727
<exclusions>
2828
<exclusion>
2929
<artifactId>commons-logging</artifactId>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.springframework</groupId>
3636
<artifactId>spring-test</artifactId>
37-
<version>${org.springframework.version}</version>
37+
<version>${spring.version}</version>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>
@@ -76,7 +76,6 @@
7676

7777
<properties>
7878
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
79-
<org.springframework.version>4.3.4.RELEASE</org.springframework.version>
8079
<org.springframework.data.version>1.3.2.RELEASE</org.springframework.data.version>
8180
<cassandra-driver-core.version>2.1.5</cassandra-driver-core.version>
8281
<cassandra-unit-spring.version>2.1.9.2</cassandra-unit-spring.version>

‎persistence-modules/spring-data-redis/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-spring</artifactId>
12+
<artifactId>parent-spring-5</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../../parent-spring</relativePath>
14+
<relativePath>../../parent-spring-5</relativePath>
1515
</parent>
1616

1717
<dependencies>
@@ -74,7 +74,6 @@
7474

7575
<properties>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
77-
<spring.version>5.0.3.RELEASE</spring.version>
7877
<spring-data-redis>2.0.3.RELEASE</spring-data-redis>
7978
<cglib.version>3.2.4</cglib.version>
8079
<jedis.version>2.9.0</jedis.version>

0 commit comments

Comments
 (0)