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

Use a Java 7-compatible version of org.json:json and remove duplicate 

Closes gh-3412
This commit is contained in:
Andy Wilkinson 2015-07-06 10:00:46 +01:00
parent 8be13f92de
commit 4ad23166ea
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +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.version>20140107</json.version>
<jooq.version>3.6.2</jooq.version>
<json-path.version>2.0.0</json-path.version>
<jstl.version>1.2</jstl.version>

6
spring-boot-parent/pom.xml
View File

@ -20,7 +20,6 @@
<main.basedir>..</main.basedir>
<java.version>1.6</java.version>
<aether.version>1.0.2.v20150114</aether.version>
<json.version>20140107</json.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.version>3.1.1</maven.version>
@ -195,11 +194,6 @@
<artifactId>gradle-plugins</artifactId>
<version>${gradle.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>