package refactoring, use of oxalis.network oxalis 5.0.0.RC1 version, …

…security policy update
OxalisCommunity · Feb 24, 2021 · 75e05e3 · 75e05e3
1 parent 9204a8d
commit 75e05e3
Show file tree

Hide file tree

Showing 46 changed files with 272 additions and 210 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,22 @@
+name: Oxalis-AS4 Snapshot publish
+
+on: [push]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,25 @@
+name: Oxalis-AS4 Release publish
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Java for publishing to Maven Central Repository
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: GPG_PASSPHRASE
+      - name: Publish to the Maven Central Repository
+        run: mvn --batch-mode deploy -P release-sign-artifacts
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
diff --git a/README.md b/README.md
@@ -1,14 +1,12 @@
+[![Oxalis-AS4 Master Build](https://github.com/OxalisCommunity/Oxalis-AS4/workflows/Oxalis-AS4%20Master%20Build/badge.svg?branch=master)](https://github.com/OxalisCommunity/oxalis-as4/actions?query=workflow%3A%22oxalis-as4%20Master%20Build%22)
 
----
-# Upcoming changes
-* Organizational changes to project - GroupID, Package name refactoring etc.
+The contents of this repository is currently in the process of switching ownership to [NorStella Oxalis Community](https://www.oxalis.network/). You as a user of Oxalis may find it interesting to [join the community](https://www.oxalis.network/join) for access to support, roadmap, early access and more. The founding meeting held online, Thursday November 19, 2020, at 08:30–10:30 CET. 
 
----
+The Oxalis Community annual meeting scheduled to be held on 25th of March 2021. Should you wish to sign up as a member of the Oxalis Community, please use the registration form available from this site: [link](https://www.oxalis.network/join)  
 
+---
 # Oxalis-AS4
 
-[![Oxalis-AS4 Master Build](https://github.com/OxalisCommunity/Oxalis-AS4/workflows/Oxalis-AS4%20Master%20Build/badge.svg?branch=master)](https://github.com/OxalisCommunity/oxalis-as4/actions?query=workflow%3A%22oxalis-as4%20Master%20Build%22)
-
 This is a release candidate of Oxalis with support for PEPPOL AS4 pMode.
 It supports Oxalis v4.0.3, v4.0.4 and v4.1.x and passes the CEF conformance test (excluding tests requiring multiple payloads).
 

diff --git a/pom.xml b/pom.xml
@@ -26,13 +26,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>no.difi.oxalis</groupId>
+        <groupId>network.oxalis</groupId>
         <artifactId>oxalis</artifactId>
-        <version>4.1.2</version>
+        <version>5.0.0.RC1</version>
     </parent>
 
     <artifactId>oxalis-as4</artifactId>
-    <version>4.1.9</version>
+    <version>5.0.0.RC1</version>
 
     <packaging>jar</packaging>
 
@@ -51,6 +51,14 @@
     </organization>
 
     <developers>
+        <developer>
+            <name>Arun Kumar</name>
+            <email>arun.kaundal@gmail.com</email>
+            <organization>Norstella</organization>
+            <roles>
+                <role>Oxalis Technical Expert</role>
+            </roles>
+        </developer>
         <developer>
             <name>Frode Bjerkholt</name>
             <email>frode.bjerholt@digdir.no</email>
@@ -63,14 +71,6 @@
             <organization>Norwegian Digitalisation Agency</organization>
             <organizationUrl>https://www.digdir.no/</organizationUrl>
         </developer>
-        <developer>
-            <name>Arun Kumar</name>
-            <email>arun.kaundal@gmail.com</email>
-            <organization>Norstella</organization>
-            <roles>
-                <role>Oxalis Technical Expert</role>
-            </roles>
-        </developer>
     </developers>
 
     <licenses>
@@ -99,8 +99,8 @@
 
         <commons.sbdh>0.9.5</commons.sbdh>
 
-        <cxf.version>3.3.5</cxf.version>
-        <wss4j.version>2.2.4</wss4j.version>
+        <cxf.version>3.3.6</cxf.version>
+        <wss4j.version>2.2.5</wss4j.version>
         <neethi.version>3.1.1</neethi.version>
         <soap.version>1.4.0</soap.version>
 
@@ -111,29 +111,29 @@
     <dependencies>
         <!-- Oxalis -->
         <dependency>
-            <groupId>no.difi.oxalis</groupId>
+            <groupId>network.oxalis</groupId>
             <artifactId>oxalis-commons</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>no.difi.oxalis</groupId>
+            <groupId>network.oxalis</groupId>
             <artifactId>oxalis-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <!-- PEPPOL -->
         <dependency>
-            <groupId>no.difi.vefa</groupId>
+            <groupId>network.oxalis.vefa</groupId>
             <artifactId>peppol-common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>no.difi.vefa</groupId>
+            <groupId>network.oxalis.vefa</groupId>
             <artifactId>peppol-sbdh</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>no.difi.vefa</groupId>
+            <groupId>network.oxalis.vefa</groupId>
             <artifactId>peppol-mode</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -321,12 +321,12 @@
 
         <!-- Test -->
         <dependency>
-            <groupId>no.difi.oxalis</groupId>
+            <groupId>network.oxalis</groupId>
             <artifactId>oxalis-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>no.difi.oxalis</groupId>
+            <groupId>network.oxalis</groupId>
             <artifactId>oxalis-outbound</artifactId>
             <scope>test</scope>
         </dependency>
@@ -516,37 +516,48 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
                         <version>2.4</version>
                         <executions>
                             <execution>
-                                <id>package-sources</id>
+                                <id>attach-sources</id>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>jar-no-fork</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.3</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
-                                <id>package-javadoc</id>
-                                <phase>package</phase>
+                                <id>attach-javadocs</id>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
                             <encoding>${java.encoding}</encoding>
+                            <additionalOptions>
+                                <additionalOption>-Xdoclint:none</additionalOption>
+                            </additionalOptions>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>1.6</version>
+                        <configuration>
+                            <!-- Prevent gpg from using pinentry programs -->
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/src/main/java/network/oxalis/as4/common/As4CommonModule.java b/src/main/java/network/oxalis/as4/common/As4CommonModule.java
@@ -31,14 +31,14 @@
 import network.oxalis.as4.util.OxalisAlgorithmSuiteLoader;
 import network.oxalis.as4.util.PolicyService;
 import network.oxalis.as4.util.TransmissionRequestUtil;
-import no.difi.oxalis.api.header.HeaderParser;
-import no.difi.oxalis.api.settings.Settings;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.settings.Settings;
 import network.oxalis.as4.config.As4Conf;
 import network.oxalis.as4.outbound.ActionProvider;
 import network.oxalis.as4.util.As4MessageFactory;
-import no.difi.oxalis.commons.guice.ImplLoader;
-import no.difi.oxalis.commons.guice.OxalisModule;
-import no.difi.vefa.peppol.mode.Mode;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.vefa.peppol.mode.Mode;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.wss4j.dom.engine.WSSConfig;

diff --git a/src/main/java/network/oxalis/as4/common/DefaultMessageIdGenerator.java b/src/main/java/network/oxalis/as4/common/DefaultMessageIdGenerator.java
@@ -26,8 +26,8 @@
 import com.google.inject.Singleton;
 import lombok.SneakyThrows;
 import network.oxalis.as4.api.MessageIdGenerator;
-import no.difi.oxalis.api.settings.Settings;
-import no.difi.oxalis.api.util.Type;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.util.Type;
 import network.oxalis.as4.config.As4Conf;
 
 import java.net.InetAddress;

diff --git a/src/main/java/network/oxalis/as4/common/DummyHeaderParser.java b/src/main/java/network/oxalis/as4/common/DummyHeaderParser.java
@@ -2,9 +2,9 @@
 
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import no.difi.oxalis.api.header.HeaderParser;
-import no.difi.oxalis.api.util.Type;
-import no.difi.vefa.peppol.common.model.*;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.*;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/src/main/java/network/oxalis/as4/common/MerlinProvider.java b/src/main/java/network/oxalis/as4/common/MerlinProvider.java
@@ -4,8 +4,8 @@
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import lombok.extern.slf4j.Slf4j;
-import no.difi.oxalis.api.lang.OxalisLoadingException;
-import no.difi.vefa.peppol.mode.Mode;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.vefa.peppol.mode.Mode;
 import org.apache.wss4j.common.crypto.Merlin;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 

diff --git a/src/main/java/network/oxalis/as4/config/As4Conf.java b/src/main/java/network/oxalis/as4/config/As4Conf.java
@@ -22,9 +22,9 @@
 
 package network.oxalis.as4.config;
 
-import no.difi.oxalis.api.settings.DefaultValue;
-import no.difi.oxalis.api.settings.Path;
-import no.difi.oxalis.api.settings.Title;
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
 
 @Title("AS4")
 public enum As4Conf {

diff --git a/src/main/java/network/oxalis/as4/inbound/AS4MessageContextKey.java b/src/main/java/network/oxalis/as4/inbound/AS4MessageContextKey.java
@@ -5,8 +5,8 @@
 @UtilityClass
 public class AS4MessageContextKey {
 
-    public static final String FIRST_PAYLOAD_PATH = "no.difi.oxalis.as4.first.payload.path";
-    public static final String FIRST_PAYLOAD_HEADER = "no.difi.oxalis.as4.first.payload.header";
-    public static final String ENVELOPE_HEADER = "no.difi.oxalis.as4.envelope.header";
-    public static final String PERSISTED = "no.difi.oxalis.as4.persisted";
+    public static final String FIRST_PAYLOAD_PATH = "network.oxalis.as4.first.payload.path";
+    public static final String FIRST_PAYLOAD_HEADER = "network.oxalis.as4.first.payload.header";
+    public static final String ENVELOPE_HEADER = "network.oxalis.as4.envelope.header";
+    public static final String PERSISTED = "network.oxalis.as4.persisted";
 }
diff --git a/src/main/java/network/oxalis/as4/inbound/AS4StatusServlet.java b/src/main/java/network/oxalis/as4/inbound/AS4StatusServlet.java
@@ -24,7 +24,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import no.difi.vefa.peppol.mode.Mode;
+import network.oxalis.vefa.peppol.mode.Mode;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java b/src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java
@@ -8,8 +8,8 @@
 import network.oxalis.as4.util.AS4ErrorCode;
 import network.oxalis.as4.util.As4MessageFactory;
 import network.oxalis.as4.util.MessageId;
-import no.difi.oxalis.api.model.TransmissionIdentifier;
-import no.difi.oxalis.api.persist.PersisterHandler;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.persist.PersisterHandler;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java b/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java
@@ -7,24 +7,24 @@
 import network.oxalis.as4.lang.OxalisAs4Exception;
 import network.oxalis.as4.lang.OxalisAs4TransmissionException;
 import network.oxalis.as4.util.*;
-import no.difi.oxalis.api.header.HeaderParser;
-import no.difi.oxalis.api.inbound.InboundService;
-import no.difi.oxalis.api.lang.TimestampException;
-import no.difi.oxalis.api.lang.VerifierException;
-import no.difi.oxalis.api.model.Direction;
-import no.difi.oxalis.api.model.TransmissionIdentifier;
-import no.difi.oxalis.api.persist.PersisterHandler;
-import no.difi.oxalis.api.timestamp.Timestamp;
-import no.difi.oxalis.api.timestamp.TimestampProvider;
-import no.difi.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.api.lang.TimestampException;
+import network.oxalis.api.lang.VerifierException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.persist.PersisterHandler;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.api.transmission.TransmissionVerifier;
 import network.oxalis.as4.common.As4MessageProperties;
 import network.oxalis.as4.common.As4MessageProperty;
-import no.difi.oxalis.commons.header.SbdhHeaderParser;
-import no.difi.oxalis.commons.io.UnclosableInputStream;
-import no.difi.vefa.peppol.common.code.DigestMethod;
-import no.difi.vefa.peppol.common.model.*;
-import no.difi.vefa.peppol.sbdh.SbdReader;
-import no.difi.vefa.peppol.sbdh.lang.SbdhException;
+import network.oxalis.commons.header.SbdhHeaderParser;
+import network.oxalis.commons.io.UnclosableInputStream;
+import network.oxalis.vefa.peppol.common.code.DigestMethod;
+import network.oxalis.vefa.peppol.common.model.*;
+import network.oxalis.vefa.peppol.sbdh.SbdReader;
+import network.oxalis.vefa.peppol.sbdh.lang.SbdhException;
 import org.apache.cxf.attachment.AttachmentUtil;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Attachment;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4InboundMetadata.java b/src/main/java/network/oxalis/as4/inbound/As4InboundMetadata.java
@@ -1,10 +1,10 @@
 package network.oxalis.as4.inbound;
 
-import no.difi.oxalis.api.inbound.InboundMetadata;
-import no.difi.oxalis.api.model.TransmissionIdentifier;
-import no.difi.oxalis.api.tag.Tag;
-import no.difi.oxalis.api.timestamp.Timestamp;
-import no.difi.vefa.peppol.common.model.*;
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.vefa.peppol.common.model.*;
 
 import java.security.cert.X509Certificate;
 import java.util.*;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4PayloadHeader.java b/src/main/java/network/oxalis/as4/inbound/As4PayloadHeader.java
@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import lombok.ToString;
-import no.difi.vefa.peppol.common.model.*;
+import network.oxalis.vefa.peppol.common.model.*;
 
 import javax.xml.soap.MimeHeader;
 import java.util.Collection;