Revert "4972 - Remove Javadocs from release"

This commit is contained in:
Richard Cordovano 2019-04-30 16:35:26 -04:00 committed by GitHub
parent 85ae667873
commit bcb5987430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 123 additions and 58 deletions

View File

@ -2,77 +2,75 @@
<info organisation="org.sleuthkit.autopsy" module="corelibs"/> <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
<configurations > <configurations >
<!-- module dependencies --> <!-- module dependencies -->
<conf name="corelibs"/> <conf name="autopsy_core"/>
</configurations> </configurations>
<dependencies> <dependencies>
<!-- for ingest --> <!-- for ingest -->
<dependency conf="corelibs->*" org="org.reflections" name="reflections" rev="0.9.8"/> <dependency conf="autopsy_core->*" org="org.reflections" name="reflections" rev="0.9.8"/>
<dependency org="com.google.code.gson" name="gson" rev="2.8.5"/> <dependency org="com.google.code.gson" name="gson" rev="2.8.5"/>
<dependency org="com.apple" name="AppleJavaExtensions" rev="1.4"/> <dependency org="com.apple" name="AppleJavaExtensions" rev="1.4"/>
<!-- for viewers --> <!-- for viewers -->
<dependency conf="corelibs->*" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.0.0"/> <dependency conf="autopsy_core->*" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.0.0"/>
<dependency conf="corelibs->*" org="net.java.dev.jna" name="jna" rev="3.4.0"/> <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna" rev="3.4.0"/>
<dependency conf="corelibs->*" org="net.java.dev.jna" name="platform" rev="3.4.0"/> <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="platform" rev="3.4.0"/>
<!-- for file search --> <!-- for file search -->
<dependency conf="corelibs->*" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/> <dependency conf="autopsy_core->*" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/>
<!-- commmon --> <!-- commmon -->
<dependency org="com.google.guava" name="guava" rev="19.0"/> <dependency org="com.google.guava" name="guava" rev="19.0"/>
<dependency conf="corelibs->*" org="org.apache.commons" name="commons-lang3" rev="3.0"/> <dependency conf="autopsy_core->*" org="org.apache.commons" name="commons-lang3" rev="3.0"/>
<dependency conf="corelibs->*" org="org.apache.commons" name="commons-csv" rev="1.4"/> <dependency conf="autopsy_core->*" org="org.apache.commons" name="commons-csv" rev="1.4"/>
<!-- keep old commons-lang because some deps may need it at runtime. <!-- keep old commons-lang because some deps may need it at runtime.
Note there is no namespace collision with ver 3 --> Note there is no namespace collision with ver 3 -->
<dependency conf="corelibs->*" org="commons-lang" name="commons-lang" rev="2.6"/> <dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.6"/>
<dependency conf="corelibs->*" org="commons-logging" name="commons-logging" rev="1.1.2"/> <dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.2"/>
<dependency conf="corelibs->*" org="commons-io" name="commons-io" rev="2.5"/> <dependency conf="autopsy_core->*" org="commons-io" name="commons-io" rev="2.5"/>
<dependency conf="corelibs->*" org="log4j" name="log4j" rev="1.2.17"/> <dependency conf="autopsy_core->*" org="log4j" name="log4j" rev="1.2.17"/>
<!-- <dependency conf="corelibs->*" org="org.jdom" name="jdom" rev="1.1.3"/> --> <!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
<dependency conf="corelibs->*" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/> <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>
<dependency conf="corelibs->*" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/> <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/>
<!-- process and system monitoring, note: matching native libs pulled from thirdparty --> <!-- process and system monitoring, note: matching native libs pulled from thirdparty -->
<dependency conf="corelibs->*" org="org.fusesource" name="sigar" rev="1.6.4" /> <dependency conf="autopsy_core->*" org="org.fusesource" name="sigar" rev="1.6.4" />
<!-- better image resizing --> <!-- better image resizing -->
<dependency conf="corelibs->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" /> <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
<!-- timeline and image analyzer --> <!-- timeline and image analyzer -->
<dependency conf="corelibs->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" /> <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
<!-- timeline --> <!-- timeline -->
<dependency conf="corelibs->*" org="joda-time" name="joda-time" rev="2.4" /> <dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />
<dependency conf="corelibs->*" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r4" /> <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r4" />
<dependency conf="corelibs->*" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r4" /> <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r4" />
<dependency conf="corelibs->*" org="org.jfxtras" name="jfxtras-common" rev="8.0-r4" /> <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-common" rev="8.0-r4" />
<!-- templateing engine used by timeline to generate its snapshot report --> <!-- templateing engine used by timeline to generate its snapshot report -->
<dependency conf="corelibs->*" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.1" /> <dependency conf="autopsy_core->*" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.1" />
<!-- image support for autopsy and image gallery --> <!-- image support for autopsy and image gallery -->
<dependency conf="corelibs->default" org="com.twelvemonkeys.common" name="common-lang" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.common" name="common-io" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.common" name="common-image" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="3.2" />
<dependency conf="corelibs->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.2" /> <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.2" />
<dependency conf="corelibs->default" org="com.googlecode.plist" name="dd-plist" rev="1.20"/> <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.20"/>
<exclude org="*" ext="*" type="javadoc"/>
<!-- conflict resolutions for multiple JAR versions --> <!-- conflict resolutions for multiple JAR versions -->
<conflict org="net.java.dev.jna" module="jna" rev="3.4.0"/> <conflict org="net.java.dev.jna" module="jna" rev="3.4.0"/>
<conflict org="net.java.dev.jna" module="platform" rev="3.4.0"/> <conflict org="net.java.dev.jna" module="platform" rev="3.4.0"/>

View File

@ -13,7 +13,11 @@ file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar
file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar
file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
file.reference.commons-lang3-3.0-javadoc.jar=release/modules/ext/commons-lang3-3.0-javadoc.jar
file.reference.commons-lang3-3.0-sources.jar=release/modules/ext/commons-lang3-3.0-sources.jar
file.reference.commons-lang3-3.0.jar=release/modules/ext/commons-lang3-3.0.jar file.reference.commons-lang3-3.0.jar=release/modules/ext/commons-lang3-3.0.jar
file.reference.commons-logging-1.1.2-javadoc.jar=release/modules/ext/commons-logging-1.1.2-javadoc.jar
file.reference.commons-logging-1.1.2-sources.jar=release/modules/ext/commons-logging-1.1.2-sources.jar
file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
@ -37,6 +41,8 @@ file.reference.imageio-sgi-3.2.jar=release/modules/ext/imageio-sgi-3.2.jar
file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar
file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar
file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar
file.reference.imgscalr-lib-4.2-javadoc.jar=release/modules/ext/imgscalr-lib-4.2-javadoc.jar
file.reference.imgscalr-lib-4.2-sources.jar=release/modules/ext/imgscalr-lib-4.2-sources.jar
file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar
file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
@ -44,6 +50,8 @@ file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-
file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar
file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar
file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
file.reference.joda-time-2.4-javadoc.jar=release/modules/ext/joda-time-2.4-javadoc.jar
file.reference.joda-time-2.4-sources.jar=release/modules/ext/joda-time-2.4-sources.jar
file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
@ -60,6 +68,7 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-sche
file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar
file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
file.reference.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar
file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar

View File

@ -762,6 +762,10 @@
<package>schemaorg_apache_xmlbeans.system.sXMLSCHEMA</package> <package>schemaorg_apache_xmlbeans.system.sXMLSCHEMA</package>
<package>schemaorg_apache_xmlbeans.system.sXMLTOOLS</package> <package>schemaorg_apache_xmlbeans.system.sXMLTOOLS</package>
</public-packages> </public-packages>
<class-path-extension>
<runtime-relative-path>ext/commons-logging-1.1.2-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-logging-1.1.2-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/imageio-thumbsdb-3.2.jar</runtime-relative-path> <runtime-relative-path>ext/imageio-thumbsdb-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-thumbsdb-3.2.jar</binary-origin> <binary-origin>release/modules/ext/imageio-thumbsdb-3.2.jar</binary-origin>
@ -798,6 +802,10 @@
<runtime-relative-path>ext/imageio-icns-3.2.jar</runtime-relative-path> <runtime-relative-path>ext/imageio-icns-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-icns-3.2.jar</binary-origin> <binary-origin>release/modules/ext/imageio-icns-3.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/imgscalr-lib-4.2-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imgscalr-lib-4.2-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path> <runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
<binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin> <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
@ -858,6 +866,10 @@
<runtime-relative-path>ext/activation-1.1.jar</runtime-relative-path> <runtime-relative-path>ext/activation-1.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/activation-1.1.jar</binary-origin> <binary-origin>release/modules/ext/activation-1.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/joda-time-2.4-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/joda-time-2.4-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/poi-scratchpad-4.0.1.jar</runtime-relative-path> <runtime-relative-path>ext/poi-scratchpad-4.0.1.jar</runtime-relative-path>
<binary-origin>release\modules\ext\poi-scratchpad-4.0.1.jar</binary-origin> <binary-origin>release\modules\ext\poi-scratchpad-4.0.1.jar</binary-origin>
@ -886,6 +898,10 @@
<runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path> <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
<binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin> <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/sigar-1.6.4-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sigar-1.6.4-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path> <runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path>
<binary-origin>release/modules/ext/avalon-framework-4.1.5.jar</binary-origin> <binary-origin>release/modules/ext/avalon-framework-4.1.5.jar</binary-origin>
@ -910,6 +926,10 @@
<runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path> <runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin> <binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/joda-time-2.4-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/joda-time-2.4-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jfxtras-fxml-8.0-r4.jar</runtime-relative-path> <runtime-relative-path>ext/jfxtras-fxml-8.0-r4.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jfxtras-fxml-8.0-r4.jar</binary-origin> <binary-origin>release/modules/ext/jfxtras-fxml-8.0-r4.jar</binary-origin>
@ -922,6 +942,14 @@
<runtime-relative-path>ext/commons-compress-1.18.jar</runtime-relative-path> <runtime-relative-path>ext/commons-compress-1.18.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-compress-1.18.jar</binary-origin> <binary-origin>release/modules/ext/commons-compress-1.18.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-logging-1.1.2-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-logging-1.1.2-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
<binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/gson-2.8.5.jar</runtime-relative-path> <runtime-relative-path>ext/gson-2.8.5.jar</runtime-relative-path>
<binary-origin>release/modules/ext/gson-2.8.5.jar</binary-origin> <binary-origin>release/modules/ext/gson-2.8.5.jar</binary-origin>
@ -950,6 +978,10 @@
<runtime-relative-path>ext/imageio-bmp-3.2.jar</runtime-relative-path> <runtime-relative-path>ext/imageio-bmp-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-bmp-3.2.jar</binary-origin> <binary-origin>release/modules/ext/imageio-bmp-3.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-lang3-3.0-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/platform-3.4.0.jar</runtime-relative-path> <runtime-relative-path>ext/platform-3.4.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/platform-3.4.0.jar</binary-origin> <binary-origin>release/modules/ext/platform-3.4.0.jar</binary-origin>
@ -1026,6 +1058,10 @@
<runtime-relative-path>ext/imageio-metadata-3.2.jar</runtime-relative-path> <runtime-relative-path>ext/imageio-metadata-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-metadata-3.2.jar</binary-origin> <binary-origin>release/modules/ext/imageio-metadata-3.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/imgscalr-lib-4.2-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imgscalr-lib-4.2-sources.jar</binary-origin>
</class-path-extension>
</data> </data>
</configuration> </configuration>
</project> </project>

View File

@ -30,7 +30,7 @@
<target name="get-deps" depends="init-ivy, get-solr-deployment"> <target name="get-deps" depends="init-ivy, get-solr-deployment">
<!-- fetch all the dependencies from Ivy and stick them in the right places --> <!-- fetch all the dependencies from Ivy and stick them in the right places -->
<ivy:resolve log="quiet"/> <ivy:resolve log="quiet"/>
<ivy:retrieve conf="keywordsearch" pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" /> <ivy:retrieve conf="autopsy" pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
<ivy:retrieve conf="solr-war" pattern="${basedir}/release/solr/webapps/solr.war" /> <ivy:retrieve conf="solr-war" pattern="${basedir}/release/solr/webapps/solr.war" />
<ivy:retrieve conf="start-solr" pattern="${basedir}/release/solr/start.jar" /> <ivy:retrieve conf="start-solr" pattern="${basedir}/release/solr/start.jar" />
<ivy:retrieve conf="jetty-libs" pattern="${basedir}/release/solr/lib/[artifact]-[revision](-[classifier]).[ext]" /> <ivy:retrieve conf="jetty-libs" pattern="${basedir}/release/solr/lib/[artifact]-[revision](-[classifier]).[ext]" />

View File

@ -3,7 +3,7 @@
<info organisation="org.sleuthkit.autopsy" module="keywordsearch"/> <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
<configurations > <configurations >
<!-- module dependencies --> <!-- module dependencies -->
<conf name="keywordsearch"/> <conf name="autopsy"/>
<!-- Solr server dependencies --> <!-- Solr server dependencies -->
<conf name="solr-libs"/> <conf name="solr-libs"/>
@ -18,19 +18,21 @@
<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file --> <dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file -->
<!-- Autopsy --> <!-- Autopsy -->
<dependency conf="keywordsearch->*" org="org.apache.solr" name="solr-solrj" rev="4.9.1"/> <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="4.9.1"/>
<dependency conf="keywordsearch->*" org="commons-lang" name="commons-lang" rev="2.4"/> <dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
<dependency conf="keywordsearch->*" org="commons-validator" name="commons-validator" rev="1.5.1"/> <dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
<!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy --> <!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
<dependency conf="keywordsearch->*" org="org.apache.tika" name="tika-parsers" rev="1.20"> <dependency conf="autopsy->*" org="org.apache.tika" name="tika-parsers" rev="1.20">
<exclude module="cxf-rt-rs-client"/> <exclude module="cxf-rt-rs-client"/>
<exclude module="cleartk-ml"/> <exclude module="cleartk-ml"/>
</dependency> </dependency>
<dependency conf="keywordsearch->*" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
<dependency conf="keywordsearch->*" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> <dependency conf="autopsy->*" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
<dependency conf="autopsy->*" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
<!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) --> <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
<dependency conf="keywordsearch->*" org="com.ibm.icu" name="icu4j" rev="3.8"/> <dependency conf="autopsy->*" org="com.ibm.icu" name="icu4j" rev="3.8"/>
<dependency conf="keywordsearch->*" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/> <dependency conf="autopsy->*" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
<!-- Jetty --> <!-- Jetty -->
<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/> <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/>
@ -42,7 +44,5 @@
<dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.10"/> <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.10"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.10"/> <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.10"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.10"/> <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.10"/>
<exclude org="*" ext="*" type="javadoc"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>

View File

@ -12,6 +12,8 @@ file.reference.commons-io-2.3.jar=release\\modules\\ext\\commons-io-2.3.jar
file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar
file.reference.commons-validator-1.5.1-javadoc.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar
file.reference.commons-validator-1.5.1-sources.jar=release/modules/ext/commons-validator-1.5.1-sources.jar
file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar
file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar
@ -26,6 +28,8 @@ file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar
file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar
file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
file.reference.jericho-html-3.3-javadoc.jar=release/modules/ext/jericho-html-3.3-javadoc.jar
file.reference.jericho-html-3.3-sources.jar=release/modules/ext/jericho-html-3.3-sources.jar
file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar
file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
@ -42,6 +46,8 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas
file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar
file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar
file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar
file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar
file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar
file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar

View File

@ -235,6 +235,10 @@
<package>org.slf4j.helpers</package> <package>org.slf4j.helpers</package>
<package>org.slf4j.spi</package> <package>org.slf4j.spi</package>
</public-packages> </public-packages>
<class-path-extension>
<runtime-relative-path>ext/commons-validator-1.5.1-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-validator-1.5.1-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path> <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-digester-1.8.1.jar</binary-origin> <binary-origin>release/modules/ext/commons-digester-1.8.1.jar</binary-origin>
@ -383,6 +387,14 @@
<runtime-relative-path>ext/jericho-html-3.3-sources.jar</runtime-relative-path> <runtime-relative-path>ext/jericho-html-3.3-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jericho-html-3.3-sources.jar</binary-origin> <binary-origin>release/modules/ext/jericho-html-3.3-sources.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/solr-solrj-4.9.1-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/solr-solrj-4.9.1-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path> <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin> <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
@ -439,6 +451,10 @@
<runtime-relative-path>ext/commons-csv-1.0.jar</runtime-relative-path> <runtime-relative-path>ext/commons-csv-1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-csv-1.0.jar</binary-origin> <binary-origin>release/modules/ext/commons-csv-1.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-validator-1.5.1-javadoc.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-validator-1.5.1-javadoc.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path> <runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin> <binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin>