From decd164fa6d4a50f8d7b57451969cfe76fdb7992 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Mon, 21 May 2018 16:37:54 -0500 Subject: [PATCH] Require JUnit 4.12 instead of 4.11 WALA itself does not use any JUnit 4.12 features. However, I am working on a WALA-based project that does require JUnit 4.12. Mixing jar versions is a path to madness. So if the WALA maintainers don't mind, it would make my life easier if WALA itself required JUnit 4.12. Otherwise, I need to maintain that 4.11/4.12 difference indefinitely as a divergence between official WALA and my WALA variant. I suppose an alternative could be to let the JUnit version be specified externally somehow. I have not explored this option in depth, but could look into it if simply moving to JUnit 4.12 is undesirable. --- com.ibm.wala.cast.java.test/build.gradle | 2 +- com.ibm.wala.cast.java.test/pom.xml | 2 +- com.ibm.wala.cast.js.html.nu_validator/pom.xml | 2 +- com.ibm.wala.cast.js.nodejs.test/build.gradle | 2 +- com.ibm.wala.cast.js.nodejs.test/pom.xml | 2 +- com.ibm.wala.cast.js.rhino.test/build.gradle | 2 +- com.ibm.wala.cast.js.rhino.test/pom.xml | 2 +- com.ibm.wala.cast.js.test/build.gradle | 2 +- com.ibm.wala.cast.js.test/pom.xml | 2 +- com.ibm.wala.cast.test/build.gradle | 2 +- com.ibm.wala.cast.test/pom.xml | 2 +- com.ibm.wala.core.tests/build.gradle | 2 +- com.ibm.wala.core.tests/pom.xml | 2 +- com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.dalvik.test/build.gradle | 2 +- com.ibm.wala.dalvik.test/pom.xml | 2 +- com.ibm.wala.ide.jdt.test/build.gradle | 2 +- com.ibm.wala.ide.jsdt.tests/build.gradle | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/com.ibm.wala.cast.java.test/build.gradle b/com.ibm.wala.cast.java.test/build.gradle index 1f6b7e47e..9c2f1253b 100644 --- a/com.ibm.wala.cast.java.test/build.gradle +++ b/com.ibm.wala.cast.java.test/build.gradle @@ -7,7 +7,7 @@ sourceSets.test.java.srcDirs = ['src'] dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', 'org.osgi:org.osgi.core:4.2.0', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.java'), diff --git a/com.ibm.wala.cast.java.test/pom.xml b/com.ibm.wala.cast.java.test/pom.xml index 48d403b4c..55715b02f 100644 --- a/com.ibm.wala.cast.java.test/pom.xml +++ b/com.ibm.wala.cast.java.test/pom.xml @@ -35,7 +35,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.cast.js.html.nu_validator/pom.xml b/com.ibm.wala.cast.js.html.nu_validator/pom.xml index f3bcec8f1..df8f142a2 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/pom.xml +++ b/com.ibm.wala.cast.js.html.nu_validator/pom.xml @@ -61,7 +61,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.cast.js.nodejs.test/build.gradle b/com.ibm.wala.cast.js.nodejs.test/build.gradle index f23821dc2..3193d3fcd 100644 --- a/com.ibm.wala.cast.js.nodejs.test/build.gradle +++ b/com.ibm.wala.cast.js.nodejs.test/build.gradle @@ -5,7 +5,7 @@ sourceSets.test { dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', project(':com.ibm.wala.cast.js.nodejs'), project(':com.ibm.wala.core'), ) diff --git a/com.ibm.wala.cast.js.nodejs.test/pom.xml b/com.ibm.wala.cast.js.nodejs.test/pom.xml index 445e033a0..c0c98559d 100644 --- a/com.ibm.wala.cast.js.nodejs.test/pom.xml +++ b/com.ibm.wala.cast.js.nodejs.test/pom.xml @@ -35,7 +35,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle index a648b7264..4eb6b3b9e 100644 --- a/com.ibm.wala.cast.js.rhino.test/build.gradle +++ b/com.ibm.wala.cast.js.rhino.test/build.gradle @@ -7,7 +7,7 @@ sourceSets.test { dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.js'), project(':com.ibm.wala.cast.js.rhino'), diff --git a/com.ibm.wala.cast.js.rhino.test/pom.xml b/com.ibm.wala.cast.js.rhino.test/pom.xml index 3b5a55af8..5d8da7a43 100644 --- a/com.ibm.wala.cast.js.rhino.test/pom.xml +++ b/com.ibm.wala.cast.js.rhino.test/pom.xml @@ -38,7 +38,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle index 7eee4f639..9fb5961e1 100644 --- a/com.ibm.wala.cast.js.test/build.gradle +++ b/com.ibm.wala.cast.js.test/build.gradle @@ -7,7 +7,7 @@ sourceSets.test { dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.js'), project(':com.ibm.wala.cast.js.rhino'), diff --git a/com.ibm.wala.cast.js.test/pom.xml b/com.ibm.wala.cast.js.test/pom.xml index 88a522695..cc07d2820 100644 --- a/com.ibm.wala.cast.js.test/pom.xml +++ b/com.ibm.wala.cast.js.test/pom.xml @@ -38,7 +38,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle index 7229c6cf8..80e5437b0 100644 --- a/com.ibm.wala.cast.test/build.gradle +++ b/com.ibm.wala.cast.test/build.gradle @@ -8,7 +8,7 @@ sourceSets.test.java.srcDirs = ['harness-src/java'] dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', project(':com.ibm.wala.cast'), project(':com.ibm.wala.core'), project(':com.ibm.wala.util'), diff --git a/com.ibm.wala.cast.test/pom.xml b/com.ibm.wala.cast.test/pom.xml index 51f5b5c96..4246d3af6 100644 --- a/com.ibm.wala.cast.test/pom.xml +++ b/com.ibm.wala.cast.test/pom.xml @@ -70,7 +70,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle index be4f9c998..11d78f710 100644 --- a/com.ibm.wala.core.tests/build.gradle +++ b/com.ibm.wala.core.tests/build.gradle @@ -11,7 +11,7 @@ sourceSets.test { dependencies { testCompile( 'eclipse-deps:org.eclipse.core.runtime:+', - 'junit:junit:4.11', + 'junit:junit:4.12', 'org.apache.ant:ant:1.8.2', 'org.hamcrest:hamcrest-core:1.3', 'org.osgi:org.osgi.core:4.2.0', diff --git a/com.ibm.wala.core.tests/pom.xml b/com.ibm.wala.core.tests/pom.xml index 95a7cfd00..5576d18dd 100644 --- a/com.ibm.wala.core.tests/pom.xml +++ b/com.ibm.wala.core.tests/pom.xml @@ -35,7 +35,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF index 7c78df629..73deeee01 100644 --- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, com.ibm.wala.dalvik;bundle-version="1.0.0", com.ibm.wala.core;bundle-version="1.3.4", com.ibm.wala.shrike;bundle-version="1.3.4", - org.junit;bundle-version="4.11.0" + org.junit;bundle-version="4.12.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index a80780dc5..edc5a89a2 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -117,7 +117,7 @@ clean.dependsOn cleanDownloadSampleLex dependencies { testCompile( - 'junit:junit:4.11', + 'junit:junit:4.12', 'org.osgi:org.osgi.core:4.2.0', files("${copyDxJar.destinationDir}/dx.jar"), project(':com.ibm.wala.core'), diff --git a/com.ibm.wala.dalvik.test/pom.xml b/com.ibm.wala.dalvik.test/pom.xml index 4d77d0287..e8d352827 100644 --- a/com.ibm.wala.dalvik.test/pom.xml +++ b/com.ibm.wala.dalvik.test/pom.xml @@ -54,7 +54,7 @@ junit junit - 4.11 + 4.12 test diff --git a/com.ibm.wala.ide.jdt.test/build.gradle b/com.ibm.wala.ide.jdt.test/build.gradle index 4358d7ff3..92bfe6ac6 100644 --- a/com.ibm.wala.ide.jdt.test/build.gradle +++ b/com.ibm.wala.ide.jdt.test/build.gradle @@ -8,7 +8,7 @@ dependencies { 'eclipse-deps:org.eclipse.core.runtime:+', 'eclipse-deps:org.eclipse.jdt.core:+', 'eclipse-deps:org.eclipse.osgi:+', - 'junit:junit:4.11', + 'junit:junit:4.12', 'org.osgi:org.osgi.core:4.2.0', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.java'), diff --git a/com.ibm.wala.ide.jsdt.tests/build.gradle b/com.ibm.wala.ide.jsdt.tests/build.gradle index 0202e09eb..54efd50d6 100644 --- a/com.ibm.wala.ide.jsdt.tests/build.gradle +++ b/com.ibm.wala.ide.jsdt.tests/build.gradle @@ -8,7 +8,7 @@ dependencies { 'eclipse-deps:org.eclipse.core.runtime:+', 'eclipse-deps:org.eclipse.equinox.common:+', 'eclipse-deps:org.eclipse.osgi:+', - 'junit:junit:4.11', + 'junit:junit:4.12', 'org.osgi:org.osgi.core:4.2.0', 'wst-deps:org.eclipse.wst.jsdt.core:+', project(':com.ibm.wala.cast'),