Used OxalisCommunity version of pkix-ocsp, commons-certvalidator and …

…peppol-specifications, bump bouncycastle to 1.70, bump vefa-peppol to 2.3, Bump javax.mail to 1.6.7, replaced mysql connector with mariaDB etc
OxalisCommunity · Aug 2, 2022 · 6929719 · 6929719
1 parent ada95b6
commit 6929719
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 50 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -34,7 +34,7 @@ Support for other UBL/BIS formats, supports more databases bugfixes.
 * Added support for OIOUBL and NESUBL (#184)
 * Added raw-statistics support for Microsoft MS-SQL and Oracle databases (#177 and #195)
 * Improved TransmissionResponse returns more details, like endpoint and protocol used (#132)
-* Changed Maven grouping to no.difi.oxalis, allows for Maven Central later (#189)
+* Changed Maven grouping to network.oxalis, allows for Maven Central later (#189)
 
 ## 3.0.2 (2014-11-06)
 Mostly a bugfix and a few improvements.

diff --git a/doc/configuration.adoc b/doc/configuration.adoc
@@ -3,7 +3,7 @@
 == Upgrading to 5.0
 Oxalis already supporting default CNAME lookup, so configuration 'lookup.locator.class' is Not required in ```oxalis.conf```.
 If it exist then either remove it or comment it out:
-#lookup.locator.class=no.difi.vefa.peppol.lookup.locator.BusdoxLocator
+#lookup.locator.class=network.oxalis.vefa.peppol.lookup.locator.BusdoxLocator
 
 HTTP Client parameters (validate_after_inactivity & time_to_live) made configurable
 ----

diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/mode/ModeModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/mode/ModeModule.java
@@ -25,10 +25,10 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.klakegg.pkix.ocsp.api.OcspFetcher;
-import no.difi.certvalidator.api.CrlCache;
-import no.difi.certvalidator.api.CrlFetcher;
-import no.difi.certvalidator.util.SimpleCrlCache;
+import network.oxalis.pkix.ocsp.api.OcspFetcher;
+import network.oxalis.commons.certvalidator.api.CrlCache;
+import network.oxalis.commons.certvalidator.api.CrlFetcher;
+import network.oxalis.commons.certvalidator.util.SimpleCrlCache;
 import network.oxalis.api.lang.OxalisLoadingException;
 import network.oxalis.commons.guice.OxalisModule;
 import network.oxalis.vefa.peppol.common.lang.PeppolLoadingException;
@@ -47,6 +47,10 @@
 /**
  * @author erlend
  * @since 4.0.0
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ *
  */
 @Slf4j
 public class ModeModule extends OxalisModule {

diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/mode/ModeProvider.java b/oxalis-commons/src/main/java/network/oxalis/commons/mode/ModeProvider.java
@@ -28,8 +28,8 @@
 import io.opentracing.Span;
 import io.opentracing.Tracer;
 import io.opentracing.contrib.spanmanager.DefaultSpanManager;
-import net.klakegg.pkix.ocsp.api.OcspFetcher;
-import no.difi.certvalidator.api.CrlFetcher;
+import network.oxalis.pkix.ocsp.api.OcspFetcher;
+import network.oxalis.commons.certvalidator.api.CrlFetcher;
 import network.oxalis.api.lang.OxalisLoadingException;
 import network.oxalis.vefa.peppol.common.lang.PeppolLoadingException;
 import network.oxalis.vefa.peppol.mode.Mode;
@@ -42,6 +42,9 @@
 /**
  * @author erlend
  * @since 4.0.4
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
  */
 public class ModeProvider implements Provider<Mode> {
 

diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/mode/OxalisCrlFetcher.java b/oxalis-commons/src/main/java/network/oxalis/commons/mode/OxalisCrlFetcher.java
@@ -28,10 +28,10 @@
 import io.opentracing.contrib.apache.http.client.Constants;
 import io.opentracing.contrib.spanmanager.DefaultSpanManager;
 import io.opentracing.contrib.spanmanager.SpanManager;
-import no.difi.certvalidator.api.CertificateValidationException;
-import no.difi.certvalidator.api.CrlCache;
-import no.difi.certvalidator.util.CrlUtils;
-import no.difi.certvalidator.util.SimpleCachingCrlFetcher;
+import network.oxalis.commons.certvalidator.api.CertificateValidationException;
+import network.oxalis.commons.certvalidator.api.CrlCache;
+import network.oxalis.commons.certvalidator.util.CrlUtils;
+import network.oxalis.commons.certvalidator.util.SimpleCachingCrlFetcher;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -46,6 +46,11 @@
 
 /**
  * @author erlend
+ * @since 4.0.0
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ *
  */
 @Singleton
 public class OxalisCrlFetcher extends SimpleCachingCrlFetcher {

diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/mode/OxalisOcspFetcher.java b/oxalis-commons/src/main/java/network/oxalis/commons/mode/OxalisOcspFetcher.java
@@ -28,8 +28,8 @@
 import io.opentracing.contrib.apache.http.client.Constants;
 import io.opentracing.contrib.spanmanager.DefaultSpanManager;
 import io.opentracing.contrib.spanmanager.SpanManager;
-import net.klakegg.pkix.ocsp.api.OcspFetcher;
-import net.klakegg.pkix.ocsp.api.OcspFetcherResponse;
+import network.oxalis.pkix.ocsp.api.OcspFetcher;
+import network.oxalis.pkix.ocsp.api.OcspFetcherResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -44,6 +44,10 @@
 
 /**
  * @author erlend
+ * @since 4.0.0
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
  */
 @Singleton
 public class OxalisOcspFetcher implements OcspFetcher {

diff --git a/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/Main.java b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/Main.java
@@ -29,7 +29,7 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import lombok.extern.slf4j.Slf4j;
-import no.difi.certvalidator.Validator;
+import network.oxalis.commons.certvalidator.Validator;
 import network.oxalis.api.model.TransmissionIdentifier;
 import network.oxalis.outbound.OxalisOutboundComponent;
 import network.oxalis.vefa.peppol.common.model.*;
@@ -55,6 +55,9 @@
  * @author Nigel Parker
  * @author Thore Johnsen
  * @author erlend
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
  */
 @Slf4j
 public class Main {

diff --git a/oxalis-extension/oxalis-as2/pom.xml b/oxalis-extension/oxalis-as2/pom.xml
@@ -75,13 +75,13 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
         </dependency>
-        <!-- <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-        </dependency> -->
 
         <!-- Guice -->
         <dependency>

diff --git a/...s-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnMimeMessageInspector.java b/...s-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnMimeMessageInspector.java
@@ -52,6 +52,10 @@
  *
  * @author steinar
  * @author thore
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ *
  */
 @Slf4j
 public class MdnMimeMessageInspector {
@@ -78,7 +82,7 @@ public MimeMultipart getSignedMultiPart() {
     public MimeMultipart getMultipartReport() {
         try {
             BodyPart bodyPart = getSignedMultiPart().getBodyPart(0);
-            MimeMultipart multipartReport = (MimeMultipart) bodyPart.getContent();
+            MimeMultipart multipartReport  = new MimeMultipart (bodyPart.getDataHandler().getDataSource());
             if (!containsIgnoreCase(multipartReport.getContentType(), "multipart/report")) {
                 throw new IllegalStateException(
                         "The first body part of the first part of the signed message is not a multipart/report");
@@ -141,7 +145,7 @@ private BodyPart getBodyPartAt(int position) {
 
     public String getPlainTextPartAsText() {
         try {
-            return (String) getPlainTextBodyPart().getContent();
+            return getPlainTextBodyPart().getContent().toString();
         } catch (Exception e) {
             throw new IllegalStateException("Unable to retrieve the plain text from the MDN: " + e.getMessage(), e);
         }

diff --git a/...gacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/ParseSbdhTest.java b/...gacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/ParseSbdhTest.java
@@ -22,8 +22,8 @@
 
 package network.oxalis.sniffer.sbdh;
 
-import no.difi.commons.sbdh.jaxb.DocumentIdentification;
-import no.difi.commons.sbdh.jaxb.StandardBusinessDocument;
+import network.oxalis.peppol.sbdh.jaxb.DocumentIdentification;
+import network.oxalis.peppol.sbdh.jaxb.StandardBusinessDocument;
 import org.testng.annotations.Test;
 
 import javax.xml.bind.JAXBContext;
@@ -40,6 +40,9 @@
  * @author steinar
  *         Date: 23.10.13
  *         Time: 14:51
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
  */
 public class ParseSbdhTest {
 

diff --git a/oxalis-test/pom.xml b/oxalis-test/pom.xml
@@ -117,8 +117,8 @@
 
         <!-- Database -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>

diff --git a/oxalis-test/src/main/resources/dummy/pki.xml b/oxalis-test/src/main/resources/dummy/pki.xml
@@ -1,4 +1,4 @@
-<ValidatorRecipe xmlns="http://difi.no/xsd/certvalidator/1.0" name="peppol-test" version="2016-10-16">
+<ValidatorRecipe xmlns="http://oxalis.network/xsd/certvalidator/1.0" name="peppol-test" version="2016-10-16">
     <Validator>
         <!-- <Signing type="PUBLIC_SIGNED"/> -->
         <!-- <Chain>

diff --git a/pom.xml b/pom.xml
@@ -62,9 +62,10 @@
         <java.encoding>UTF-8</java.encoding>
         <slf4j.version>2.0.0-alpha7</slf4j.version>
         <logback.version>1.3.0-alpha16</logback.version>
-        <bouncycastle.version>1.57</bouncycastle.version>
+        <bouncycastle.version>1.70</bouncycastle.version>
         <google.guice.version>4.2.2</google.guice.version>
-        <vefa.peppol.version>2.3.0</vefa.peppol.version>
+        <vefa.peppol.version>2.4.0</vefa.peppol.version>
+        <mariadb-java-client-version>2.7.3</mariadb-java-client-version>
         <brave.version>5.6.5</brave.version>
         <jetty.version>9.4.48.v20220622</jetty.version>
         <opentracing.version>0.33.0</opentracing.version>
@@ -239,11 +240,6 @@
                 <artifactId>bcprov-jdk15on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
 
             <!-- VEFA PEPPOL -->
             <dependency>
@@ -289,20 +285,14 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>jakarta.mail</artifactId>
+                <version>1.6.7</version>
             </dependency>
             <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>javax.mail-api</artifactId>
-                <version>1.5.6</version>
+                <groupId>com.sun.activation</groupId>
+                <artifactId>jakarta.activation</artifactId>
+                <version>1.2.2</version>
             </dependency>
 
             <!-- Apache commons -->
@@ -337,9 +327,9 @@
 
             <!-- MySQL -->
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>8.0.29</version>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${mariadb-java-client-version}</version>
             </dependency>
 
             <!-- H2 -->