diff --git a/.idea/libraries/JUnit4.xml b/.idea/libraries/JUnit4.xml index 40885bee7390..3d61767e539b 100644 --- a/.idea/libraries/JUnit4.xml +++ b/.idea/libraries/JUnit4.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 934195d24156..0415426449ed 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -197,7 +197,7 @@ libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version: libraryLicense(name: "JNA", libraryName: "jna", version: "3.4.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php") libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.44", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt") libraryLicense(name: "JUnit", libraryName: "JUnit3", version: "3.8.1", license: "CPL 1.0", url: "http://junit.org/") -libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.11", license: "CPL 1.0", url: "http://junit.org/") +libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.8", license: "CPL 1.0", url: "http://junit.org/") libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2", license: "Apache 2.0", url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://logging.apache.org/license.html") 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: "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") diff --git a/lib/junit-4.10.jar b/lib/junit-4.10.jar new file mode 100644 index 000000000000..bf5c0b9c6ad2 Binary files /dev/null and b/lib/junit-4.10.jar differ diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar deleted file mode 100644 index 4d552a6f3fd0..000000000000 Binary files a/lib/junit-4.11.jar and /dev/null differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 0ca5faabb65c..c96ae96a1909 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -21,7 +21,7 @@ jna-utils.jar jna.jar jsr173_1.0_api.jar junit.jar -junit-4.11.jar +junit-4.10.jar log4j.jar jgoodies-common-1.2.1.jar jgoodies-looks-2.4.2.jar diff --git a/lib/src/junit-4.10-src.jar b/lib/src/junit-4.10-src.jar new file mode 100644 index 000000000000..1449d28b5b96 Binary files /dev/null and b/lib/src/junit-4.10-src.jar differ diff --git a/lib/src/junit-4.11-src.jar b/lib/src/junit-4.11-src.jar deleted file mode 100644 index 80801569a5b2..000000000000 Binary files a/lib/src/junit-4.11-src.jar and /dev/null differ diff --git a/plugins/eclipse/testData/iml/allProps/expected/expected.iml b/plugins/eclipse/testData/iml/allProps/expected/expected.iml index 142bc1072c84..73bb462498fa 100644 --- a/plugins/eclipse/testData/iml/allProps/expected/expected.iml +++ b/plugins/eclipse/testData/iml/allProps/expected/expected.iml @@ -101,7 +101,7 @@ - +