Skip to content

Commit 015377f

Browse files
author
Dave Syer
committed
Exclude log4j in a couple of places (see gh-1660)
also rename spring-cloud starter
1 parent 0b116a1 commit 015377f

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

spring-boot-autoconfigure/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114
<groupId>org.codehaus.woodstox</groupId>
115115
<artifactId>wstx-asl</artifactId>
116116
</exclusion>
117+
<exclusion>
118+
<artifactId>log4j</artifactId>
119+
<groupId>log4j</groupId>
120+
</exclusion>
117121
</exclusions>
118122
</dependency>
119123
<dependency>

spring-boot-dependencies/pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35
<groupId>org.springframework.boot</groupId>
46
<artifactId>spring-boot-dependencies</artifactId>
@@ -1155,6 +1157,12 @@
11551157
<groupId>org.springframework.cloud</groupId>
11561158
<artifactId>spring-cloud-spring-service-connector</artifactId>
11571159
<version>${spring-cloud.version}</version>
1160+
<exclusions>
1161+
<exclusion>
1162+
<artifactId>log4j</artifactId>
1163+
<groupId>log4j</groupId>
1164+
</exclusion>
1165+
</exclusions>
11581166
</dependency>
11591167
<dependency>
11601168
<groupId>org.springframework.data</groupId>
@@ -1451,10 +1459,8 @@
14511459
<activeByDefault>true</activeByDefault>
14521460
</activation>
14531461
<repositories>
1454-
<!--
1455-
Repositories to allow snapshot and milestone BOM imports during
1456-
development. This section is stripped out when a full release is prepared.
1457-
-->
1462+
<!-- Repositories to allow snapshot and milestone BOM imports during
1463+
development. This section is stripped out when a full release is prepared. -->
14581464
<repository>
14591465
<id>spring-milestones</id>
14601466
<name>Spring Milestones</name>

spring-boot-starters/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<module>spring-boot-starter-amqp</module>
2525
<module>spring-boot-starter-aop</module>
2626
<module>spring-boot-starter-batch</module>
27+
<module>spring-boot-starter-cloud-connectors</module>
2728
<module>spring-boot-starter-data-elasticsearch</module>
2829
<module>spring-boot-starter-data-gemfire</module>
2930
<module>spring-boot-starter-data-jpa</module>

spring-boot-starters/spring-boot-starter-cloud/pom.xml renamed to spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<artifactId>spring-boot-starters</artifactId>
77
<version>1.2.0.BUILD-SNAPSHOT</version>
88
</parent>
9-
<artifactId>spring-boot-starter-cloud</artifactId>
10-
<name>Spring Boot Cloud Multiplatform Starter</name>
9+
<artifactId>spring-boot-starter-cloud-connectors</artifactId>
10+
<name>spring-boot-starter-cloud-connectors</name>
1111
<description>Spring Boot Starter for Spring Cloud</description>
1212
<url>http://projects.spring.io/spring-boot/</url>
1313
<organization>

0 commit comments

Comments
 (0)