Merge pull request #1366 from APriestman/controlsfx_fix

Controlsfx fix
This commit is contained in:
Richard Cordovano 2015-06-16 12:19:17 -04:00
commit c9a1d88290
3 changed files with 7 additions and 6 deletions

View File

@ -1,4 +1,5 @@
<ivy-module version="2.0"> <ivy-module version="2.0">
<info organisation="org.sleuthkit.autopsy" module="corelibs"/> <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
<configurations > <configurations >
@ -36,7 +37,7 @@
<dependency conf="autopsy_core->*" 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="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.20.9" /> <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.9" />
<dependency conf="autopsy_core->*" org="org.controlsfx" name="openjfx-dialogs" rev="1.0.3"/> <dependency conf="autopsy_core->*" org="org.controlsfx" name="openjfx-dialogs" rev="1.0.3"/>
<!-- timeline and --> <!-- timeline and -->

View File

@ -12,7 +12,7 @@ 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-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-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.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9.jar file.reference.controlsfx-8.40.9.jar=release/modules/ext/controlsfx-8.40.9.jar
file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
@ -59,6 +59,6 @@ file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
javac.source=1.7 javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
javadoc.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9-javadoc.jar javadoc.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.40.9-javadoc.jar
nbm.needs.restart=true nbm.needs.restart=true
source.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.20.9-sources.jar source.reference.controlsfx-8.20.9.jar=release/modules/ext/controlsfx-8.40.9-sources.jar

View File

@ -769,8 +769,8 @@
<binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin> <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/controlsfx-8.20.9.jar</runtime-relative-path> <runtime-relative-path>ext/controlsfx-8.40.9.jar</runtime-relative-path>
<binary-origin>release/modules/ext/controlsfx-8.20.9.jar</binary-origin> <binary-origin>release/modules/ext/controlsfx-8.40.9.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path> <runtime-relative-path>ext/commons-lang3-3.0-javadoc.jar</runtime-relative-path>