Skip to content

Commit 9b4e748

Browse files
author
eugenp
committed
maven fixes
1 parent a45c5f1 commit 9b4e748

File tree

9 files changed

+75
-2
lines changed

9 files changed

+75
-2
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<module>spring-security-mvc-session</module>
3232
<module>spring-security-rest</module>
3333
<module>spring-security-rest-basic-auth</module>
34-
<module>spring-security-rest-custom</module>
34+
<!-- <module>spring-security-rest-custom</module> -->
3535
<module>spring-security-rest-digest-auth</module>
36-
<module>spring-security-rest-full</module>
36+
<!-- <module>spring-security-rest-full</module> -->
3737
</modules>
3838

3939
</project>

‎spring-security-basic-auth/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<groupId>org.springframework</groupId>
3030
<artifactId>spring-core</artifactId>
3131
<version>${org.springframework.version}</version>
32+
<exclusions>
33+
<exclusion>
34+
<artifactId>commons-logging</artifactId>
35+
<groupId>commons-logging</groupId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework</groupId>

‎spring-security-mvc-custom/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<groupId>org.springframework</groupId>
3535
<artifactId>spring-core</artifactId>
3636
<version>${org.springframework.version}</version>
37+
<exclusions>
38+
<exclusion>
39+
<artifactId>commons-logging</artifactId>
40+
<groupId>commons-logging</groupId>
41+
</exclusion>
42+
</exclusions>
3743
</dependency>
3844
<dependency>
3945
<groupId>org.springframework</groupId>

‎spring-security-mvc-digest-auth/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<groupId>org.springframework</groupId>
3030
<artifactId>spring-core</artifactId>
3131
<version>${org.springframework.version}</version>
32+
<exclusions>
33+
<exclusion>
34+
<artifactId>commons-logging</artifactId>
35+
<groupId>commons-logging</groupId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework</groupId>

‎spring-security-mvc-login/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<groupId>org.springframework</groupId>
3535
<artifactId>spring-core</artifactId>
3636
<version>${org.springframework.version}</version>
37+
<exclusions>
38+
<exclusion>
39+
<artifactId>commons-logging</artifactId>
40+
<groupId>commons-logging</groupId>
41+
</exclusion>
42+
</exclusions>
3743
</dependency>
3844
<dependency>
3945
<groupId>org.springframework</groupId>

‎spring-security-mvc-session/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<groupId>org.springframework</groupId>
3535
<artifactId>spring-core</artifactId>
3636
<version>${org.springframework.version}</version>
37+
<exclusions>
38+
<exclusion>
39+
<artifactId>commons-logging</artifactId>
40+
<groupId>commons-logging</groupId>
41+
</exclusion>
42+
</exclusions>
3743
</dependency>
3844
<dependency>
3945
<groupId>org.springframework</groupId>

‎spring-security-rest-custom/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<groupId>org.springframework</groupId>
3030
<artifactId>spring-core</artifactId>
3131
<version>${org.springframework.version}</version>
32+
<exclusions>
33+
<exclusion>
34+
<artifactId>commons-logging</artifactId>
35+
<groupId>commons-logging</groupId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework</groupId>

‎spring-security-rest-full/pom.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
<groupId>org.springframework</groupId>
2929
<artifactId>spring-core</artifactId>
3030
<version>${org.springframework.version}</version>
31+
<exclusions>
32+
<exclusion>
33+
<artifactId>commons-logging</artifactId>
34+
<groupId>commons-logging</groupId>
35+
</exclusion>
36+
</exclusions>
3137
</dependency>
3238
<dependency>
3339
<groupId>org.springframework</groupId>
@@ -71,6 +77,25 @@
7177
<version>${org.springframework.version}</version>
7278
</dependency>
7379

80+
<!-- web -->
81+
82+
<dependency>
83+
<groupId>org.apache.httpcomponents</groupId>
84+
<artifactId>httpclient</artifactId>
85+
<version>${httpclient.version}</version>
86+
<exclusions>
87+
<exclusion>
88+
<artifactId>commons-logging</artifactId>
89+
<groupId>commons-logging</groupId>
90+
</exclusion>
91+
</exclusions>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.httpcomponents</groupId>
95+
<artifactId>httpcore</artifactId>
96+
<version>${httpcore.version}</version>
97+
</dependency>
98+
7499
<!-- persistence -->
75100

76101
<dependency>
@@ -198,6 +223,12 @@
198223
<artifactId>rest-assured</artifactId>
199224
<version>2.3.0</version>
200225
<scope>test</scope>
226+
<exclusions>
227+
<exclusion>
228+
<artifactId>commons-logging</artifactId>
229+
<groupId>commons-logging</groupId>
230+
</exclusion>
231+
</exclusions>
201232
</dependency>
202233

203234
</dependencies>

‎spring-security-rest/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<groupId>org.springframework</groupId>
3030
<artifactId>spring-core</artifactId>
3131
<version>${org.springframework.version}</version>
32+
<exclusions>
33+
<exclusion>
34+
<artifactId>commons-logging</artifactId>
35+
<groupId>commons-logging</groupId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework</groupId>

0 commit comments

Comments
 (0)