diff --git a/Core/build.xml b/Core/build.xml index 140a0916f9d220d0a4fc9208ac5d4933d33ef31c..678610846ae0f5b63240926a0955687d289da6eb 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -106,7 +106,7 @@ <copy file="${thirdparty.dir}/sevenzip/sevenzipjbinding-AllPlatforms.jar" todir="${ext.dir}" /> <!-- <copy file="${thirdparty.dir}/stix/StixLib.jar" todir="${ext.dir}" /> --> <copy todir="${ext.dir}"> - <fileset dir="${thirdparty.dir}/IcePDF 6.2.2/"/> + <fileset dir="${thirdparty.dir}/jai/"/> </copy> <copy file="${thirdparty.dir}/jdom/jdom-2.0.5.jar" todir="${ext.dir}" /> <copy file="${thirdparty.dir}/jdom/jdom-2.0.5-contrib.jar" todir="${ext.dir}" /> diff --git a/Core/ivy.xml b/Core/ivy.xml index 4d6c14a0dba73338ad4457b56fe5373f2bd0da05..29feb749f38f55ee6a503f5d44fbaa4b9a1a29d8 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -42,6 +42,26 @@ <!-- for handling diffs --> <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.11"/> + <dependency conf="core->default" org="org.icepdf.os" name="icepdf-viewer" rev="6.2.2"> + <!-- get the new latest batik items below, override bouncy castle --> + <exclude org="batik" module="batik-awt-util"/> + <exclude org="batik" module="batik-dom"/> + <exclude org="batik" module="batik-svg-dom"/> + <exclude org="batik" module="batik-svggen"/> + <exclude org="batik" module="batik-util"/> + <exclude org="batik" module="batik-xml"/> + <exclude org="batik" module="batik-xml"/> + <!-- doesn't work with ivy; will be added separately --> + <exclude org="javax.media" module="jai_core"/> + <exclude org="com.sun.media" module="jai_imageio"/> + </dependency> + + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="1.14"/> + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="1.14"/> + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="1.14"/> + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="1.14"/> + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="1.14"/> + <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="1.14"/> <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api --> <dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/> diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 66450139753d5ba4600f2ad53c0154922e5797a5..faeb60cee88edc416e9b685eba765d32cfc4ecbb 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,11 +1,11 @@ file.reference.activemq-all-5.16.4.jar=release/modules/ext/activemq-all-5.16.4.jar file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar -file.reference.batik-awt-util-1.6.jar=release/modules/ext/batik-awt-util-1.6.jar -file.reference.batik-dom-1.6.jar=release/modules/ext/batik-dom-1.6.jar -file.reference.batik-svg-dom-1.6.jar=release/modules/ext/batik-svg-dom-1.6.jar -file.reference.batik-svggen-1.6.jar=release/modules/ext/batik-svggen-1.6.jar -file.reference.batik-util-1.6.jar=release/modules/ext/batik-util-1.6.jar -file.reference.batik-xml-1.6.jar=release/modules/ext/batik-xml-1.6.jar +file.reference.batik-awt-util-1.14.jar=release/modules/ext/batik-awt-util-1.14.jar +file.reference.batik-dom-1.14.jar=release/modules/ext/batik-dom-1.14.jar +file.reference.batik-svg-dom-1.14.jar=release/modules/ext/batik-svg-dom-1.14.jar +file.reference.batik-svggen-1.14.jar=release/modules/ext/batik-svggen-1.14.jar +file.reference.batik-util-1.14.jar=release/modules/ext/batik-util-1.14.jar +file.reference.batik-xml-1.14.jar=release/modules/ext/batik-xml-1.14.jar file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar file.reference.bcprov-ext-jdk15on-1.70.jar=release/modules/ext/bcprov-ext-jdk15on-1.70.jar file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar @@ -66,7 +66,6 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.11.1.jar=release/modules/ext/sleuthkit-4.11.1.jar file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuco-4.11.1.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 05ac769955a25e3b7a51accc6772d62d08603aa2..9ba936cc79d1bb361523b5e615428ab3d2bf7a2d 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -355,28 +355,28 @@ <binary-origin>release/modules/ext/audience-annotations-0.12.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-awt-util-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-awt-util-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-awt-util-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-awt-util-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-dom-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-dom-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-dom-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-dom-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-svg-dom-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-svg-dom-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-svg-dom-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-svg-dom-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-svggen-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-svggen-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-svggen-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-svggen-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-util-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-util-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-util-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-util-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/batik-xml-1.6.jar</runtime-relative-path> - <binary-origin>release/modules/ext/batik-xml-1.6.jar</binary-origin> + <runtime-relative-path>ext/batik-xml-1.14.jar</runtime-relative-path> + <binary-origin>release/modules/ext/batik-xml-1.14.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/bcpkix-jdk15on-1.70.jar</runtime-relative-path> @@ -618,10 +618,6 @@ <runtime-relative-path>ext/sleuthkit-caseuco-4.11.1.jar</runtime-relative-path> <binary-origin>release/modules/ext/sleuthkit-caseuco-4.11.1.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> - <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/snakeyaml-1.30.jar</runtime-relative-path> <binary-origin>release/modules/ext/snakeyaml-1.30.jar</binary-origin> diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 80bb6bf9aff90e59b49dd13c7568368e0819f273..44c9ad4e0704fc27150e3ab2ced69102a6be5efd 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -85,8 +85,12 @@ <dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/> <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.23"/> + <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="1.7.36"/> + <exclude org="*" ext="*" type="javadoc"/> + <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/> + <override org="com.google.code.gson" module="gson" rev="2.9.0"/> <override org="com.google.guava" module="guava" rev="31.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.13.2"/> diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index b4afd88b51a02503f21d2d4b056cc7b7d95366e5..d0563016e28c50f44c593da52b1155c376445e01 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -107,7 +107,10 @@ file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-ia file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-util-3.19.4.jar file.reference.re2j-1.5.jar=release/modules/ext/re2j-1.5.jar +file.reference.reload4j-1.2.19.jar=release/modules/ext/slf4j-reload4j-1.2.19.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar +file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar file.reference.xmlbeans-3.0.1.jar=release/modules/ext/xmlbeans-3.0.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index febd3c941683c468d6a2851f26ecba5fc43ff1ce..27dc2b150cfc042ddb9ef63ee6840391f0648add 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -488,6 +488,10 @@ <package>org.openxmlformats.schemas.wordprocessingml.x2006.main</package> <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package> <package>org.sleuthkit.autopsy.corelibs</package> + <package>org.slf4j</package> + <package>org.slf4j.event</package> + <package>org.slf4j.helpers</package> + <package>org.slf4j.spi</package> <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package> </public-packages> <class-path-extension> @@ -926,10 +930,22 @@ <runtime-relative-path>ext/re2j-1.5.jar</runtime-relative-path> <binary-origin>release/modules/ext/re2j-1.5.jar</binary-origin> </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/reload4j-1.2.19.jar</runtime-relative-path> + <binary-origin>release/modules/ext/reload4j-1.2.19.jar</binary-origin> + </class-path-extension> <class-path-extension> <runtime-relative-path>ext/sigar-1.6.4.jar</runtime-relative-path> <binary-origin>release/modules/ext/sigar-1.6.4.jar</binary-origin> </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> + <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/slf4j-reload4j-1.7.36.jar</runtime-relative-path> + <binary-origin>release/modules/ext/slf4j-reload4j-1.7.36.jar</binary-origin> + </class-path-extension> <class-path-extension> <runtime-relative-path>ext/threetenbp-1.5.2.jar</runtime-relative-path> <binary-origin>release/modules/ext/threetenbp-1.5.2.jar</binary-origin> diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 0a37b804b60901a31d6a7063513ee6b47e4f43c5..94904051efcdf7333d545ce773c06cdc32ad2d6d 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -39,7 +39,6 @@ file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar file.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 817080efe41702a008a25fa2f065de01589f4ced..da9fb97c26b3cc8922d280ed5e8b64e5391af011 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -380,10 +380,6 @@ <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.68.Final.jar</runtime-relative-path> <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> - <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/snappy-java-1.1.7.6.jar</runtime-relative-path> <binary-origin>release/modules/ext/snappy-java-1.1.7.6.jar</binary-origin> diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index 74ce1385ec319b499cbed83e2abada730a3293f9..d4d84993f077f0b3af73d2c396e6a376ffce1406 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -96,7 +96,6 @@ file.reference.sis-netcdf-1.1.jar=release/modules/ext/sis-netcdf-1.1.jar file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.jar file.reference.sis-storage-1.1.jar=release/modules/ext/sis-storage-1.1.jar file.reference.sis-utility-1.1.jar=release/modules/ext/sis-utility-1.1.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.SparseBitSet-1.2.jar=release/modules/ext/SparseBitSet-1.2.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index 0f4f2024e48a71ae0c2f6276298d9bea911da688..171c840a7ff9c9daf559690ce494c780f14cbe76 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -5,7 +5,17 @@ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3"> <code-name-base>org.sleuthkit.autopsy.Tika</code-name-base> <suite-component/> - <module-dependencies/> + <module-dependencies> + <dependency> + <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <release-version>3</release-version> + <specification-version>1.4</specification-version> + </run-dependency> + </dependency> + </module-dependencies> <public-packages> <package>org.apache.james.mime4j</package> <package>org.apache.james.mime4j.dom</package> @@ -690,10 +700,6 @@ <runtime-relative-path>ext/sis-utility-1.1.jar</runtime-relative-path> <binary-origin>release/modules/ext/sis-utility-1.1.jar</binary-origin> </class-path-extension> - <class-path-extension> - <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path> - <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin> - </class-path-extension> <class-path-extension> <runtime-relative-path>ext/SparseBitSet-1.2.jar</runtime-relative-path> <binary-origin>release/modules/ext/SparseBitSet-1.2.jar</binary-origin> diff --git a/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar deleted file mode 100755 index b62ac15866e1511e1580c9819b081bcb4814becf..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar deleted file mode 100755 index bf144ab070ce2acf381894bb8f301837a8c4c63f..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar deleted file mode 100755 index c8970fbb4d3eb7637e059148ea8c10d9debf07e5..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar deleted file mode 100755 index 819f2da07a4add1334ad37e333ddb38bae66bf9d..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar deleted file mode 100755 index 7550b4802ed080fddf1118e6d66506a70909ea12..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar deleted file mode 100755 index 1b915a05038a8dc992fb0f012d9081be2d9dbd0f..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar b/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar deleted file mode 100644 index 07223f634c631ff624f592206dfa40e79ddd34d3..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar b/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar deleted file mode 100644 index 903491e1b0015f8b17abe6724c2ef93786b602aa..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar b/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar deleted file mode 100644 index 0e4198e5a415e3379be699da481c98271a893a37..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar b/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar deleted file mode 100755 index b5555280e1c0d59663c2db8c5278515099eae375..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar b/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar deleted file mode 100755 index d58fcc9de3494d86b624851b46407f8787d4fed1..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/jai_core-1.1.3.jar b/thirdparty/jai/jai_core-1.1.3.jar old mode 100755 new mode 100644 similarity index 100% rename from thirdparty/IcePDF 6.2.2/jai_core-1.1.3.jar rename to thirdparty/jai/jai_core-1.1.3.jar diff --git a/thirdparty/IcePDF 6.2.2/jai_imageio-1.1.jar b/thirdparty/jai/jai_imageio-1.1.jar old mode 100755 new mode 100644 similarity index 100% rename from thirdparty/IcePDF 6.2.2/jai_imageio-1.1.jar rename to thirdparty/jai/jai_imageio-1.1.jar