yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

GP-2167: Removing JMockit jar dependency

Browse source
This commit is contained in:
Ryan Kurtz 2022-06-18 02:52:30 -04:00
parent 78de8e6d49
commit d2883bbb8c
8 changed files with 5 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/Decompiler/build.gradle
View file

@ -31,7 +31,6 @@ dependencies {
api project(':SoftwareModeling') api project(':SoftwareModeling')
// include Base src/test/resources when running decompiler integration tests (uses defaultTools) // include Base src/test/resources when running decompiler integration tests (uses defaultTools)
integrationTestImplementation project(path: ':Base', configuration: 'testArtifacts') integrationTestImplementation project(path: ':Base', configuration: 'testArtifacts')
testImplementation "org.jmockit:jmockit:1.44"
helpPath project(path: ":Base", configuration: 'helpPath') helpPath project(path: ":Base", configuration: 'helpPath')
} }

2
Ghidra/Features/FunctionGraph/build.gradle
View file

@ -30,8 +30,6 @@ dependencies {
api project(":GraphServices") api project(":GraphServices")
testImplementation "org.jmockit:jmockit:1.44"
helpPath project(path: ":Base", configuration: 'helpPath') helpPath project(path: ":Base", configuration: 'helpPath')
} }

2
Ghidra/Features/PDB/build.gradle
View file

@ -31,8 +31,6 @@ eclipse.project.name = 'Features PDB'
dependencies { dependencies {
api project(":Base") api project(":Base")
testImplementation "org.jmockit:jmockit:1.44"
// Demangler Analyzer needs to find MicrosoftDemangler // Demangler Analyzer needs to find MicrosoftDemangler
api project(":MicrosoftDemangler") api project(":MicrosoftDemangler")
helpPath project(path: ':Base', configuration: 'helpPath') // this module's help has links to Base help files helpPath project(path: ':Base', configuration: 'helpPath') // this module's help has links to Base help files

1
Ghidra/Features/VersionTracking/build.gradle
View file

@ -29,7 +29,6 @@ dependencies {
helpPath project(path: ":Base", configuration: "helpPath") helpPath project(path: ":Base", configuration: "helpPath")
testImplementation "org.jmockit:jmockit:1.44"
testImplementation project(path: ':Project', configuration: 'testArtifacts') testImplementation project(path: ':Project', configuration: 'testArtifacts')
testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts') testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
} }

2
Ghidra/Framework/SoftwareModeling/build.gradle
View file

@ -44,8 +44,6 @@ dependencies {
runtimeOnly "msv:relaxngDatatype:20050913" runtimeOnly "msv:relaxngDatatype:20050913"
api "msv:isorelax: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 // 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) // version 2.7.7 (which we don't have)
antlr "org.antlr:antlr:3.5.2" antlr "org.antlr:antlr:3.5.2"

2
gradle/javaProject.gradle
View file

@ -156,10 +156,8 @@ artifacts {
*/ */
dependencies { dependencies {
integrationTestImplementation "org.hamcrest:hamcrest:2.2" integrationTestImplementation "org.hamcrest:hamcrest:2.2"
integrationTestImplementation "org.jmockit:jmockit:1.44"
testImplementation "org.hamcrest:hamcrest:2.2" testImplementation "org.hamcrest:hamcrest:2.2"
testImplementation "org.jmockit:jmockit:1.44"
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.12"
pcodeTestImplementation "junit:junit:4.12" pcodeTestImplementation "junit:junit:4.12"

15
gradle/javaTestProject.gradle
View file

@ -23,16 +23,6 @@
apply from: "$rootProject.projectDir/gradle/support/javaTestProject.gradle" 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 -> test { t ->
forkEvery 1 forkEvery 1
@ -152,11 +142,7 @@ def initTestJVM(Task task, String rootDirName) {
task.minHeapSize xms task.minHeapSize xms
task.maxHeapSize xmx task.maxHeapSize xmx
// for jmockit; needs the javaagent option
// -javaagent:/path/to/jmockit.jar
task.doFirst { task.doFirst {
def jmockitPath = configurations.jmockitAgent.singleFile
task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage, task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage, '-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
'-Dlog4j.configurationFile=' + logPropertiesUrl, '-Dlog4j.configurationFile=' + logPropertiesUrl,
@ -177,7 +163,6 @@ def initTestJVM(Task task, String rootDirName) {
'-Duser.country=US', '-Duser.country=US',
'-Duser.language=en', '-Duser.language=en',
'-Djdk.attach.allowAttachSelf', '-Djdk.attach.allowAttachSelf',
'-javaagent:' + jmockitPath,
'-noverify', '-noverify',
'-XX:TieredStopAtLevel=1', '-XX:TieredStopAtLevel=1',
'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort, '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,

15
gradle/root/test.gradle
View file

@ -32,16 +32,6 @@
*********************************************************************************/ *********************************************************************************/
apply from: "gradle/support/testUtils.gradle" 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')) { if (!project.hasProperty('rootTestDir')) {
project.ext.rootTestDir = "build" project.ext.rootTestDir = "build"
} }
@ -320,11 +310,7 @@ def initTestJVM(Task task, String rootDirName) {
task.minHeapSize xms task.minHeapSize xms
task.maxHeapSize xmx task.maxHeapSize xmx
// for jmockit; needs the javaagent option
// -javaagent:/path/to/jmockit.jar
task.doFirst { task.doFirst {
def jmockitPath = configurations.jmockitAgent.singleFile
task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage, task.jvmArgs '-DupgradeProgramErrorMessage=' + upgradeProgramErrorMessage,
'-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage, '-DupgradeTimeErrorMessage=' + upgradeTimeErrorMessage,
'-Dlog4j.configurationFile=' + logPropertiesUrl, '-Dlog4j.configurationFile=' + logPropertiesUrl,
@ -345,7 +331,6 @@ def initTestJVM(Task task, String rootDirName) {
'-Duser.country=US', '-Duser.country=US',
'-Duser.language=en', '-Duser.language=en',
'-Djdk.attach.allowAttachSelf', '-Djdk.attach.allowAttachSelf',
'-javaagent:' + jmockitPath,
'-noverify', '-noverify',
'-XX:TieredStopAtLevel=1', '-XX:TieredStopAtLevel=1',
'-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort, '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort,