diff --git a/.idea/libraries/Groovy.xml b/.idea/libraries/Groovy.xml index a3e16bb8d1dd..3f7f2456d235 100644 --- a/.idea/libraries/Groovy.xml +++ b/.idea/libraries/Groovy.xml @@ -1,9 +1,9 @@ - + - - + + \ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 8da033429bb9..92bd43138cdf 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -202,8 +202,8 @@ libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2", license: "Ap libraryLicense(name: "Maven", version: "2.2.1", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html") libraryLicense(name: "plexus-util", version: "2.0.6", license: "Apache 2.0", url: "http://maven.apache.org/", libraryNames:['plexus-utils-2.0.6.jar'], licenseUrl: "http://apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Maven3", libraryNames: ["Maven3", "maven-dependency-tree-1.2.jar", "archetype-catalog-2.2.jar", "archetype-common-2.2.jar"], version: "3.0.3", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html") -libraryLicense(name: "Gradle", version: "1.3", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license") -libraryLicense(name: "Slf4j", version: "1.6.6", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html") +libraryLicense(name: "Gradle", version: "1.4", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license") +libraryLicense(name: "Slf4j", version: "1.7.2", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html") libraryLicense(name: "GradleGuava", version: "11.0.2", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Jsr305", version: "1.3.9", license: "New BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause") libraryLicense(name: "markdownj", attachedTo: "tasks-core", version: "", license: "BSD", url: "http://markdownj.org/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php") diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml index 6cd994032a10..925abcc74d0b 100644 --- a/plugins/gradle/gradle.iml +++ b/plugins/gradle/gradle.iml @@ -25,11 +25,11 @@ - - - - - + + + + + @@ -40,8 +40,8 @@ - - + + diff --git a/plugins/gradle/lib/gradle-base-services-1.3.jar b/plugins/gradle/lib/gradle-base-services-1.4.jar similarity index 63% rename from plugins/gradle/lib/gradle-base-services-1.3.jar rename to plugins/gradle/lib/gradle-base-services-1.4.jar index 25a2657e7e8e..b755f84af983 100644 Binary files a/plugins/gradle/lib/gradle-base-services-1.3.jar and b/plugins/gradle/lib/gradle-base-services-1.4.jar differ diff --git a/plugins/gradle/lib/gradle-core-1.3.jar b/plugins/gradle/lib/gradle-core-1.4.jar similarity index 62% rename from plugins/gradle/lib/gradle-core-1.3.jar rename to plugins/gradle/lib/gradle-core-1.4.jar index e94e4fa95f28..7df93217eb3a 100644 Binary files a/plugins/gradle/lib/gradle-core-1.3.jar and b/plugins/gradle/lib/gradle-core-1.4.jar differ diff --git a/plugins/gradle/lib/gradle-messaging-1.3.jar b/plugins/gradle/lib/gradle-messaging-1.4.jar similarity index 50% rename from plugins/gradle/lib/gradle-messaging-1.3.jar rename to plugins/gradle/lib/gradle-messaging-1.4.jar index 6974b2f02689..e570772510b1 100644 Binary files a/plugins/gradle/lib/gradle-messaging-1.3.jar and b/plugins/gradle/lib/gradle-messaging-1.4.jar differ diff --git a/plugins/gradle/lib/gradle-src.zip b/plugins/gradle/lib/gradle-src.zip index 58f669a9949e..672346527564 100644 Binary files a/plugins/gradle/lib/gradle-src.zip and b/plugins/gradle/lib/gradle-src.zip differ diff --git a/plugins/gradle/lib/gradle-tooling-api-1.3.jar b/plugins/gradle/lib/gradle-tooling-api-1.4.jar similarity index 82% rename from plugins/gradle/lib/gradle-tooling-api-1.3.jar rename to plugins/gradle/lib/gradle-tooling-api-1.4.jar index fee63475cff6..077bca9c3614 100644 Binary files a/plugins/gradle/lib/gradle-tooling-api-1.3.jar and b/plugins/gradle/lib/gradle-tooling-api-1.4.jar differ diff --git a/plugins/gradle/lib/gradle-wrapper-1.3.jar b/plugins/gradle/lib/gradle-wrapper-1.4.jar similarity index 90% rename from plugins/gradle/lib/gradle-wrapper-1.3.jar rename to plugins/gradle/lib/gradle-wrapper-1.4.jar index 466191519f48..2b1282d718b9 100644 Binary files a/plugins/gradle/lib/gradle-wrapper-1.3.jar and b/plugins/gradle/lib/gradle-wrapper-1.4.jar differ diff --git a/plugins/gradle/lib/slf4j-api-1.6.6.jar b/plugins/gradle/lib/slf4j-api-1.6.6.jar deleted file mode 100644 index 4c03fa6bb214..000000000000 Binary files a/plugins/gradle/lib/slf4j-api-1.6.6.jar and /dev/null differ diff --git a/plugins/gradle/lib/slf4j-api-1.7.2.jar b/plugins/gradle/lib/slf4j-api-1.7.2.jar new file mode 100644 index 000000000000..1a8870833b37 Binary files /dev/null and b/plugins/gradle/lib/slf4j-api-1.7.2.jar differ diff --git a/plugins/gradle/lib/slf4j-simple-1.6.6.jar b/plugins/gradle/lib/slf4j-simple-1.6.6.jar deleted file mode 100644 index 5a03ef5d0cdd..000000000000 Binary files a/plugins/gradle/lib/slf4j-simple-1.6.6.jar and /dev/null differ diff --git a/plugins/gradle/lib/slf4j-simple-1.7.2.jar b/plugins/gradle/lib/slf4j-simple-1.7.2.jar new file mode 100644 index 000000000000..2498c443b56c Binary files /dev/null and b/plugins/gradle/lib/slf4j-simple-1.7.2.jar differ