diff --git a/Core/ivy.xml b/Core/ivy.xml index 94eb446632c653a857075a1bde080b30bd981d19..4d6c14a0dba73338ad4457b56fe5373f2bd0da05 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -45,12 +45,17 @@ <!-- 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"/> - - <override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/> - <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/> + <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/> <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/> + <override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/> + <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/> <override org="com.google.guava" module="guava" rev="31.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> + + <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> + <override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/> + <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> + <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> </dependencies> </ivy-module> diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 4b738a55fbeb97968654ab17eae08dac7d62f32d..80bb6bf9aff90e59b49dd13c7568368e0819f273 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -91,5 +91,9 @@ <override org="com.google.guava" module="guava" rev="31.1-jre"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.13.2"/> <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> + + <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> + <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> + <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> </dependencies> </ivy-module> diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 36867d55dc790215052d0c2ff64d01953fc1e1d2..5056926698afde26ca4e788f37f2316dbdc736a4 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -3,9 +3,9 @@ file.reference.ant-1.10.12.jar=release/modules/ext/ant-1.10.12.jar file.reference.ant-launcher-1.10.12.jar=release/modules/ext/ant-launcher-1.10.12.jar file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.1.4.jar file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar -file.reference.bcpkix-jdk15on-1.67.jar=release/modules/ext/bcpkix-jdk15on-1.67.jar -file.reference.bcprov-ext-jdk15on-1.54.jar=release/modules/ext/bcprov-ext-jdk15on-1.54.jar -file.reference.bcprov-jdk15on-1.67.jar=release/modules/ext/bcprov-jdk15on-1.67.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 file.reference.common-image-3.8.2.jar=release/modules/ext/common-image-3.8.2.jar file.reference.common-io-3.8.2.jar=release/modules/ext/common-io-3.8.2.jar file.reference.common-lang-3.8.2.jar=release/modules/ext/common-lang-3.8.2.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 0d4b34e205fa2425aac599e356483edb8014e79b..0faa3c90871dcd921915a20fc614ac49cba007e7 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -540,16 +540,16 @@ <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/bcpkix-jdk15on-1.67.jar</runtime-relative-path> - <binary-origin>release/modules/ext/bcpkix-jdk15on-1.67.jar</binary-origin> + <runtime-relative-path>ext/bcpkix-jdk15on-1.70.jar</runtime-relative-path> + <binary-origin>release/modules/ext/bcpkix-jdk15on-1.70.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/bcprov-ext-jdk15on-1.54.jar</runtime-relative-path> - <binary-origin>release/modules/ext/bcprov-ext-jdk15on-1.54.jar</binary-origin> + <runtime-relative-path>ext/bcprov-ext-jdk15on-1.70.jar</runtime-relative-path> + <binary-origin>release/modules/ext/bcprov-ext-jdk15on-1.70.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/bcprov-jdk15on-1.67.jar</runtime-relative-path> - <binary-origin>release/modules/ext/bcprov-jdk15on-1.67.jar</binary-origin> + <runtime-relative-path>ext/bcprov-jdk15on-1.70.jar</runtime-relative-path> + <binary-origin>release/modules/ext/bcprov-jdk15on-1.70.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/common-image-3.8.2.jar</runtime-relative-path> diff --git a/Tika/ivy.xml b/Tika/ivy.xml index 10464eb16e84581059ab166d04b9bf886018e232..a67016df6e8067c2f347983f8fb9434f506f7cd2 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -13,5 +13,10 @@ <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.13.2"/> <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.13.2"/> <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.13.2"/> + + <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 --> + <override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/> + <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/> + <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> </dependencies> </ivy-module> diff --git a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.jar deleted file mode 100755 index 86f7f0be194c0671460eea7acc2bc0ea479e304b..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.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 new file mode 100644 index 0000000000000000000000000000000000000000..07223f634c631ff624f592206dfa40e79ddd34d3 Binary files /dev/null and b/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.jar deleted file mode 100755 index f31c1c1c453e8c75a0e71c2ddd259b09c87080fb..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.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 new file mode 100644 index 0000000000000000000000000000000000000000..903491e1b0015f8b17abe6724c2ef93786b602aa Binary files /dev/null and b/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.jar deleted file mode 100755 index bd95185ae8129aa3781f43bc09a194c7bd4121b1..0000000000000000000000000000000000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.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 new file mode 100644 index 0000000000000000000000000000000000000000..0e4198e5a415e3379be699da481c98271a893a37 Binary files /dev/null and b/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar differ