mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-27 06:30:51 +00:00
GP-2167: Removing JMockit jar dependency
This commit is contained in:
parent
78de8e6d49
commit
d2883bbb8c
@ -31,7 +31,6 @@ dependencies {
|
||||
api project(':SoftwareModeling')
|
||||
// include Base src/test/resources when running decompiler integration tests (uses defaultTools)
|
||||
integrationTestImplementation project(path: ':Base', configuration: 'testArtifacts')
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
helpPath project(path: ":Base", configuration: 'helpPath')
|
||||
}
|
||||
|
@ -29,9 +29,7 @@ dependencies {
|
||||
api project(":Base")
|
||||
|
||||
api project(":GraphServices")
|
||||
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
|
||||
helpPath project(path: ":Base", configuration: 'helpPath')
|
||||
}
|
||||
|
||||
|
@ -30,9 +30,7 @@ eclipse.project.name = 'Features PDB'
|
||||
*********************************************************************************/
|
||||
dependencies {
|
||||
api project(":Base")
|
||||
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
|
||||
// Demangler Analyzer needs to find MicrosoftDemangler
|
||||
api project(":MicrosoftDemangler")
|
||||
helpPath project(path: ':Base', configuration: 'helpPath') // this module's help has links to Base help files
|
||||
|
@ -29,7 +29,6 @@ dependencies {
|
||||
|
||||
helpPath project(path: ":Base", configuration: "helpPath")
|
||||
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
testImplementation project(path: ':Project', configuration: 'testArtifacts')
|
||||
testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
|
||||
}
|
||||
|
@ -43,9 +43,7 @@ dependencies {
|
||||
|
||||
runtimeOnly "msv:relaxngDatatype:20050913"
|
||||
api "msv:isorelax:20050913"
|
||||
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
|
||||
// Must specify the specific antlr implementation to use or it will default to trying to find
|
||||
// version 2.7.7 (which we don't have)
|
||||
antlr "org.antlr:antlr:3.5.2"
|
||||
|
@ -156,10 +156,8 @@ artifacts {
|
||||
*/
|
||||
dependencies {
|
||||
integrationTestImplementation "org.hamcrest:hamcrest:2.2"
|
||||
integrationTestImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
testImplementation "org.hamcrest:hamcrest:2.2"
|
||||
testImplementation "org.jmockit:jmockit:1.44"
|
||||
|
||||
testImplementation "junit:junit:4.12"
|
||||
pcodeTestImplementation "junit:junit:4.12"
|
||||
|
@ -23,16 +23,6 @@
|
||||
apply from: "$rootProject.projectDir/gradle/support/javaTestProject.gradle"
|
||||
*****************************************************************************************/
|
||||
|
||||
configurations {
|
||||
jmockitAgent
|
||||
}
|
||||
|
||||
dependencies {
|
||||
jmockitAgent('org.jmockit:jmockit:1.44') {
|
||||
exclude group: 'com.google.code.findbugs', module: 'jsr305'
|
||||
}
|
||||
}
|
||||
|
||||
test { t ->
|
||||
|
||||
forkEvery 1
|
||||
@ -152,11 +142,7 @@ def initTestJVM(Task task, String rootDirName) {
|
||||
task.minHeapSize xms
|
||||
task.maxHeapSize xmx
|
||||
|
||||
// for jmockit; needs the javaagent option
|
||||
// -javaagent:/path/to/jmockit.jar
|
||||
task.doFirst {
|
||||
def jmockitPath = configurations.jmockitAgent.singleFile
|
||||
|
||||
task.doFirst {
|
||||
task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
|
||||
'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
|
||||
'-Dlog4j.configurationFile=' + logPropertiesUrl,
|
||||
@ -177,7 +163,6 @@ def initTestJVM(Task task, String rootDirName) {
|
||||
'-Duser.country=US',
|
||||
'-Duser.language=en',
|
||||
'-Djdk.attach.allowAttachSelf',
|
||||
'-javaagent:' + jmockitPath,
|
||||
'-noverify',
|
||||
'-XX:TieredStopAtLevel=1',
|
||||
'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,
|
||||
|
@ -32,16 +32,6 @@
|
||||
*********************************************************************************/
|
||||
apply from: "gradle/support/testUtils.gradle"
|
||||
|
||||
configurations {
|
||||
jmockitAgent
|
||||
}
|
||||
|
||||
dependencies {
|
||||
jmockitAgent('org.jmockit:jmockit:1.44') {
|
||||
exclude group: 'com.google.code.findbugs', module: 'jsr305'
|
||||
}
|
||||
}
|
||||
|
||||
if (!project.hasProperty('rootTestDir')) {
|
||||
project.ext.rootTestDir = "build"
|
||||
}
|
||||
@ -320,11 +310,7 @@ def initTestJVM(Task task, String rootDirName) {
|
||||
task.minHeapSize xms
|
||||
task.maxHeapSize xmx
|
||||
|
||||
// for jmockit; needs the javaagent option
|
||||
// -javaagent:/path/to/jmockit.jar
|
||||
task.doFirst {
|
||||
def jmockitPath = configurations.jmockitAgent.singleFile
|
||||
|
||||
task.doFirst {
|
||||
task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
|
||||
'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
|
||||
'-Dlog4j.configurationFile=' + logPropertiesUrl,
|
||||
@ -345,7 +331,6 @@ def initTestJVM(Task task, String rootDirName) {
|
||||
'-Duser.country=US',
|
||||
'-Duser.language=en',
|
||||
'-Djdk.attach.allowAttachSelf',
|
||||
'-javaagent:' + jmockitPath,
|
||||
'-noverify',
|
||||
'-XX:TieredStopAtLevel=1',
|
||||
'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,
|
||||
|
Loading…
Reference in New Issue
Block a user