Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-23 04:39:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to log4j-2.8.2

Browse Source
This commit is contained in:
ghidra1 2019-04-15 11:46:36 -04:00
parent ba98e85429
commit 38edad78f1
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitignore vendored
View File

@ -1,11 +1,14 @@
*.class
excludedFiles.txt
ghidra.repos.config
# Misc files produced while executing application
repositories/
Ghidra/.ghidraSvrKeys
wrapper.log*
Thumbs.db
.DS_Store
.svn
excludedFiles.txt
.classpath
.project
ghidra.repos.config
/*/*/*/*/*/bin/
/*/*/*/*/*/build/
@ -21,7 +24,8 @@ ghidra.repos.config
/bin/
**/dist
repositories/
# Ignore Sleigh generated files
*.sla
**/data/build.xml
@ -30,22 +34,15 @@ repositories/
*.settings
*.directory
.gradle/
.settings/
# File locks
*.ulock
*.lock
# Gradle creates these per developer
**/vs/
# Misc files produced while executing application
Ghidra/.ghidraSvrKeys
wrapper.log*
# Ignore object files
*.o
*.obj
*.class
# Ignore MS Visual Studio artifcats
Release
@ -54,6 +51,8 @@ Release
*.suo
*.aps
*.vcproj.*
*.vcxproj.*
.vs/
# Ignore UNIX backup files
*~
@ -62,3 +61,4 @@ Release
# Ignore eclipse project files
.project
.classpath
.settings/

4
Ghidra/Framework/Generic/build.gradle
View File

@ -8,8 +8,8 @@ dependencies {
compile "cglib:cglib-nodep:2.2"
compile "com.google.guava:guava:19.0"
compile "org.jdom:jdom-legacy:1.1.3"
compile "org.apache.logging.log4j:log4j-api:2.8.1"
compile "org.apache.logging.log4j:log4j-core:2.8.1"
compile "org.apache.logging.log4j:log4j-api:2.8.2"
compile "org.apache.logging.log4j:log4j-core:2.8.2"
compile "org.apache.commons:commons-collections4:4.1"
compile "org.apache.commons:commons-lang3:3.5"
compile "org.lucee:commons-io:2.6.0"

6
Ghidra/Framework/Generic/certification.manifest
View File

@ -2,13 +2,13 @@
##MODULE IP: Apache License 2.0
##MODULE IP: BSD
##MODULE IP: Christian Plattner
##MODULE IP: Crystal Clear Icons - LGPL 2.1
##MODULE IP: JDOM License
##MODULE IP: MIT
##MODULE IP: Nuvola Icons - LGPL 2.1
##MODULE IP: Modified Nuvola Icons - LGPL 2.1
##MODULE IP: Tango Icons - Public Domain
##MODULE IP: Nuvola Icons - LGPL 2.1
##MODULE IP: Oxygen Icons - LGPL 3.0
##MODULE IP: Crystal Clear Icons - LGPL 2.1
##MODULE IP: Tango Icons - Public Domain
.classpath||GHIDRA||||END|
.gitignore||GHIDRA||||END|
.project||GHIDRA||||END|

4
GhidraBuild/BuildFiles/JsonDoclet/build.gradle
View File

@ -4,5 +4,7 @@ eclipse.project.name = '_JsonDoclet'
apply plugin: 'java'
dependencies {
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile('com.googlecode.json-simple:json-simple:1.1.1') {
exclude group: 'junit', module: 'junit'
}
}