root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Don’t rely on org.json:json being pulled in transitively 

Previously, spring-boot required org.json:json to be on the compile
classpath, but it was only there by virtue of it being a transitive
dependency of another of spring-boot’s dependency. This commit makes
it clear that spring-boot has an (optional) dependency on org.json:json
by having an explicit dependency declaration for it. Additionally, the
name of the version property and the alphabetical ordering in
spring-boot-dependencies have been corrected.

Closes gh-3290
This commit is contained in:
Andy Wilkinson 2015-06-22 10:38:10 +01:00
parent 347cbb1ca4
commit db1f4891e3
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-dependencies/pom.xml
View File

@ -85,7 +85,6 @@
<infinispan.version>7.2.2.Final</infinispan.version>
<jackson.version>2.5.4</jackson.version>
<janino.version>2.7.8</janino.version>
<jason.version>20141113</jason.version>
<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>
<javax-mail.version>1.5.3</javax-mail.version>
@ -100,6 +99,7 @@
<jmustache.version>1.10</jmustache.version>
<joda-time.version>2.8.1</joda-time.version>
<jolokia.version>1.3.1</jolokia.version>
<json.version>20141113</json.version>
<json-path.version>2.0.0</json-path.version>
<jstl.version>1.2</jstl.version>
<junit.version>4.12</junit.version>
@ -1467,11 +1467,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@ -1487,6 +1482,11 @@
<artifactId>jolokia-core</artifactId>
<version>${jolokia.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>

5
spring-boot/pom.xml
View File

@ -169,6 +169,11 @@
<artifactId>hibernate-validator</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>