Skip to content

S
spring-boot
Commit eb6182f5 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Remove redundant commons-logging exclusions 

Closes gh-11148
parent 80543250
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 27 deletions
spring-boot-project/spring-boot-parent/pom.xml
View file @ eb6182f5
...@@ -276,12 +276,6 @@ ...@@ -276,12 +276,6 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
View file @ eb6182f5
...@@ -21,21 +21,6 @@ ...@@ -21,21 +21,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<!-- Turn on filtering by default for application properties --> <!-- Turn on filtering by default for application properties -->
<resources> <resources>
...@@ -180,6 +165,13 @@ ...@@ -180,6 +165,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
<configuration> <configuration>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope> <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<createDependencyReducedPom>true</createDependencyReducedPom> <createDependencyReducedPom>true</createDependencyReducedPom>
......
spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml
View file @ eb6182f5
...@@ -58,12 +58,6 @@ ...@@ -58,12 +58,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment