Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 25 Sep 2015 11:26:31 +0000 (13:26 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 25 Sep 2015 11:26:31 +0000 (13:26 +0200)
.idea/libraries/commons_io_2_4.xml [new file with mode: 0644]
build/scripts/libLicenses.gant
lib/commons-io-2.4-sources.jar [new file with mode: 0644]
lib/commons-io-2.4.jar [new file with mode: 0644]
lib/required_for_dist.txt

diff --git a/.idea/libraries/commons_io_2_4.xml b/.idea/libraries/commons_io_2_4.xml
new file mode 100644 (file)
index 0000000..c93c5ad
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="commons-io-2.4">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
index 3007b785c02e693ae708f08329fc68908411db83..d5bb0caf33d760d6e1f603de0879bd5b4a85191e 100644 (file)
@@ -171,6 +171,7 @@ libraryLicense(name: "HttpComponents HttpClient", libraryName: "http-client", ve
 libraryLicense(name: "Apache Commons Net", libraryName: "commons-net", version: "3.3", license: "Apache 2.0", url: "http://commons.apache.org/net/")
 libraryLicense(name: "Apache Commons Logging", libraryName: "commons-logging", version: "1.1.1", license: "Apache 2.0", url: "http://commons.apache.org/logging/")
 libraryLicense(name: "Apache Commons IO", libraryName: "commons-io-1.4.jar", version: "1.4", license: "Apache 2.0", url: "http://commons.apache.org/io/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt")
+libraryLicense(name: "Apache Commons IO", libraryName: "commons-io-2.4", version: "2.4", license: "Apache 2.0", url: "http://commons.apache.org/io/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt")
 libraryLicense(name: "Apache Lucene", libraryName: "lucene-core-2.4.1.jar", version: "2.4.1", license: "Apache 2.0", url: "http://lucene.apache.org/java")
 libraryLicense(name: "Apache Sanselan", libraryName: "Sanselan", version: "0.98", license: "Apache 2.0", url: "http://commons.apache.org/sanselan/")
 libraryLicense(name: "Automaton", libraryName: "automaton.jar", version: "1.11", license: "BSD", url: "http://www.brics.dk/automaton/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
diff --git a/lib/commons-io-2.4-sources.jar b/lib/commons-io-2.4-sources.jar
new file mode 100644 (file)
index 0000000..f4ebc7b
Binary files /dev/null and b/lib/commons-io-2.4-sources.jar differ
diff --git a/lib/commons-io-2.4.jar b/lib/commons-io-2.4.jar
new file mode 100644 (file)
index 0000000..90035a4
Binary files /dev/null and b/lib/commons-io-2.4.jar differ
index 9b124ae26c6593531179c59b5b2df9b50e32eebe..5771aff6821c7cae8d19bccca45d0701437a3219 100644 (file)
@@ -6,6 +6,7 @@ automaton.jar
 cglib-2.2.2.jar
 cli-parser-1.1.jar
 commons-codec-1.9.jar
+commons-io-2.4.jar
 commons-httpclient-3.1-patched.jar
 commons-logging-1.2.jar
 commons-net-3.3.jar