diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 717cd5e42f..dadd26c3bc 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -13,9 +13,7 @@
-
-
-
+
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 3e366c4cb1..2c2804fbdc 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -20,9 +20,7 @@ Bundle-ClassPath: base.jar,
vt-password-3.1.1.jar,
super-csv-2.0.0-beta-1.jar,
barcode4j-2.1.jar,
- bctsp-jdk14-1.38.jar,
- bcmail-jdk14-1.38.jar,
- bcprov-jdk14-1.38.jar
+ bcprov-jdk15on-1.46.jar
Export-Package: bsh,
bsh.classpath,
bsh.collection,
@@ -127,10 +125,13 @@ Export-Package: bsh,
org.adempiere.util,
org.bouncycastle,
org.bouncycastle.asn1,
+ org.bouncycastle.asn1.bc,
org.bouncycastle.asn1.cmp,
org.bouncycastle.asn1.cms,
+ org.bouncycastle.asn1.cms.ecc,
org.bouncycastle.asn1.crmf,
org.bouncycastle.asn1.cryptopro,
+ org.bouncycastle.asn1.eac,
org.bouncycastle.asn1.esf,
org.bouncycastle.asn1.ess,
org.bouncycastle.asn1.gnu,
@@ -154,14 +155,15 @@ Export-Package: bsh,
org.bouncycastle.asn1.tsp,
org.bouncycastle.asn1.util,
org.bouncycastle.asn1.x500,
+ org.bouncycastle.asn1.x500.style,
org.bouncycastle.asn1.x509,
org.bouncycastle.asn1.x509.qualified,
org.bouncycastle.asn1.x509.sigi,
org.bouncycastle.asn1.x9,
- org.bouncycastle.cms,
org.bouncycastle.crypto,
org.bouncycastle.crypto.agreement,
org.bouncycastle.crypto.agreement.kdf,
+ org.bouncycastle.crypto.agreement.srp,
org.bouncycastle.crypto.digests,
org.bouncycastle.crypto.encodings,
org.bouncycastle.crypto.engines,
@@ -170,6 +172,7 @@ Export-Package: bsh,
org.bouncycastle.crypto.io,
org.bouncycastle.crypto.macs,
org.bouncycastle.crypto.modes,
+ org.bouncycastle.crypto.modes.gcm,
org.bouncycastle.crypto.paddings,
org.bouncycastle.crypto.params,
org.bouncycastle.crypto.prng,
@@ -184,22 +187,18 @@ Export-Package: bsh,
org.bouncycastle.jce.interfaces,
org.bouncycastle.jce.netscape,
org.bouncycastle.jce.provider,
+ org.bouncycastle.jce.provider.asymmetric,
+ org.bouncycastle.jce.provider.asymmetric.ec,
org.bouncycastle.jce.provider.symmetric,
org.bouncycastle.jce.spec,
- org.bouncycastle.mail.smime,
- org.bouncycastle.mail.smime.examples,
- org.bouncycastle.mail.smime.handlers,
- org.bouncycastle.mail.smime.util,
- org.bouncycastle.mail.smime.validator,
org.bouncycastle.math.ec,
org.bouncycastle.mozilla,
org.bouncycastle.ocsp,
org.bouncycastle.openssl,
- org.bouncycastle.sasn1,
- org.bouncycastle.sasn1.cms,
- org.bouncycastle.tsp,
org.bouncycastle.util,
org.bouncycastle.util.encoders,
+ org.bouncycastle.util.io,
+ org.bouncycastle.util.io.pem,
org.bouncycastle.util.test,
org.bouncycastle.voms,
org.bouncycastle.x509,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 0a1f9f2783..c1012cde94 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -35,9 +35,7 @@ bin.includes = META-INF/,\
OSGI-INF/addressvalidationeventhandler.xml,\
schema/,\
barcode4j-2.1.jar,\
- bctsp-jdk14-1.38.jar,\
- bcmail-jdk14-1.38.jar,\
- bcprov-jdk14-1.38.jar
+ bcprov-jdk15on-1.46.jar
output.base.jar = build/
src.includes = schema/
source.base.jar = src/