diff --git a/Core/ivy.xml b/Core/ivy.xml index 0088cc75ba..a45d09bf8b 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -30,7 +30,6 @@ - diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 58622cf7a5..27838ea554 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -12,7 +12,6 @@ file.reference.commons-compress-1.14.jar=release/modules/ext/commons-compress-1. file.reference.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar -file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar file.reference.geoapi-3.0.0.jar=release/modules/ext/geoapi-3.0.0.jar file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 802dcfbd43..bbb0693d50 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -627,10 +627,6 @@ ext/Rejistry-1.0-SNAPSHOT.jar release/modules/ext/Rejistry-1.0-SNAPSHOT.jar - - ext/dd-plist-1.20.jar - release/modules/ext/dd-plist-1.20.jar - ext/rome-1.5.1.jar release/modules/ext/rome-1.5.1.jar diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 196fcc36ee..4970130ff5 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -67,5 +67,7 @@ + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index fee5235915..037c0b3e1d 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -73,6 +73,7 @@ file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar file.reference.stax-api-1.0.1.jar=release/modules/ext/stax-api-1.0.1.jar file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar +file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index bb34c3281e..6ea61cd742 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -742,18 +742,10 @@ ext/jna-3.4.0.jar release/modules/ext/jna-3.4.0.jar - - ext/gson-2.8.1.jar - release/modules/ext/gson-2.8.1.jar - ext/jfxtras-common-8.0-r4.jar release/modules/ext/jfxtras-common-8.0-r4.jar - - ext/opencv-248.jar - release/modules/ext/opencv-248.jar - ext/jsr305-1.3.9.jar release/modules/ext/jsr305-1.3.9.jar @@ -874,6 +866,14 @@ ext/commons-codec-1.10.jar release/modules/ext/commons-codec-1.10.jar + + ext/gson-2.8.1.jar + release/modules/ext/gson-2.8.1.jar + + + ext/opencv-248.jar + release/modules/ext/opencv-248.jar + ext/slf4j-simple-1.6.1.jar release/modules/ext/slf4j-simple-1.6.1.jar @@ -970,6 +970,10 @@ ext/gstreamer-java-1.5.jar release/modules/ext/gstreamer-java-1.5.jar + + ext/dd-plist-1.20.jar + C:\Users\kelly\Workspace\autopsy\CoreLibs\release\modules\ext\dd-plist-1.20.jar + ext/dom4j-1.6.1.jar release/modules/ext/dom4j-1.6.1.jar