diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
| commit | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch) | |
| tree | fc0dcd722b6d445468dbe7dad13b4c11781b1cbe /build | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz | |
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/classVersions.txt | 2 | ||||
| -rw-r--r-- | build/scripts/libLicenses.gant | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/conf/classVersions.txt b/build/conf/classVersions.txt index dd39ad0006d3..7835116e0be0 100644 --- a/build/conf/classVersions.txt +++ b/build/conf/classVersions.txt @@ -36,4 +36,6 @@ 1.5 => plugins/Groovy/lib/groovy_rt.jar 1.5 => lib/annotations.jar +1.5 => plugins/gradle/lib/gradle-jps-plugin.jar + 1.3 => plugins/junit/lib/junit-rt.jar
\ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 872cc5f6e9fe..5319444eaae6 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -252,7 +252,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license: libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html") libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html") libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367") -libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Beta1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") +libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Beta3", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Kryo", libraryName: "Kryo", version: "2.22", license: "New BSD License", url: "https://github.com/EsotericSoftware/kryo", licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/license.txt") libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3", license: "Apache 2.0", url: "https://github.com/dain/snappy", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html") |