From 9385259d5fb7f18d7445a68be54b5d041f147475 Mon Sep 17 00:00:00 2001
From: aaron-kumar <arun.kaundal@gmail.com>
Date: Tue, 10 Jan 2023 19:42:13 +0530
Subject: [PATCH] Java 11 and security fix for next major oxalis release

---
 peppol-bdx/pom.xml        | 51 ++++++++++++++++++++++-------
 peppol-busdox/pom.xml     | 68 +++++++++++++++++++++++++++++++--------
 peppol-sbdh/pom.xml       | 52 +++++++++++++++++++++++-------
 peppol-schematron/pom.xml | 48 +++++++++++++++++++++------
 peppol-ubl21/pom.xml      | 28 ++++++++++++++--
 pom.xml                   | 37 +++++++++++++++++++--
 6 files changed, 233 insertions(+), 51 deletions(-)

diff --git a/peppol-bdx/pom.xml b/peppol-bdx/pom.xml
index 45d8ddd..0bfe221 100644
--- a/peppol-bdx/pom.xml
+++ b/peppol-bdx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>network.oxalis.peppol</groupId>
         <artifactId>peppol-specifications</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>2.0.0-RC1-SNAPSHOT</version>
     </parent>
 
     <artifactId>peppol-bdx</artifactId>
@@ -63,26 +63,55 @@
         </license>
     </licenses>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.6</version>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
-                        <id>xjc</id>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <generateDirectory>target/generated-sources/xjc/</generateDirectory>
+                            <schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
+                            <schemaIncludes>
+                                <include>*.xsd</include>
+                            </schemaIncludes>
+                            <bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
+                            <bindingIncludes>
+                                <include>*.xjb</include>
+                            </bindingIncludes>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <encoding>${java.encoding}</encoding>
-                    <target>2.1</target>
-                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file
diff --git a/peppol-busdox/pom.xml b/peppol-busdox/pom.xml
index ca1ae58..b32bf01 100644
--- a/peppol-busdox/pom.xml
+++ b/peppol-busdox/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>network.oxalis.peppol</groupId>
         <artifactId>peppol-specifications</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>2.0.0-RC1-SNAPSHOT</version>
     </parent>
 
     <artifactId>peppol-busdox</artifactId>
@@ -64,29 +64,69 @@
         </license>
     </licenses>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.jws</groupId>
+            <artifactId>jakarta.jws-api</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.6</version>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
-                        <id>xjc</id>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <encoding>${java.encoding}</encoding>
+                            <generateDirectory>target/generated-sources/xjc/</generateDirectory>
+                            <schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
+                            <schemaIncludes>
+                                <include>*.xsd</include>
+                            </schemaIncludes>
+                            <bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
+                            <bindingIncludes>
+                                <include>*.xjb</include>
+                            </bindingIncludes>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <encoding>${java.encoding}</encoding>
-                    <target>2.1</target>
-                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.jvnet.jax-ws-commons</groupId>
+                <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.3.5</version>
                 <executions>
                     <!-- Use one execution per WSDL file, as the wsdlLocation can specify only one file at a time. The wsdlLocation
                       is the location how the WSDL file will be referenced in the code (using class.getResource). Also important: use a different
@@ -98,6 +138,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
+                            <encoding>${java.encoding}</encoding>
                             <wsdlFiles>
                                 <wsdlFile>ManageBusinessIdentifierService-1.0.wsdl</wsdlFile>
                             </wsdlFiles>
@@ -115,6 +156,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
+                            <encoding>${java.encoding}</encoding>
                             <wsdlFiles>
                                 <wsdlFile>ManageServiceMetadataService-1.0.wsdl</wsdlFile>
                             </wsdlFiles>
@@ -142,7 +184,7 @@
                     <dependency>
                         <groupId>com.sun.xml.ws</groupId>
                         <artifactId>jaxws-tools</artifactId>
-                        <version>2.2.10</version>
+                        <version>2.3.5</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/peppol-sbdh/pom.xml b/peppol-sbdh/pom.xml
index d454838..e05165a 100644
--- a/peppol-sbdh/pom.xml
+++ b/peppol-sbdh/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>network.oxalis.peppol</groupId>
         <artifactId>peppol-specifications</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>2.0.0-RC1-SNAPSHOT</version>
     </parent>
 
     <artifactId>peppol-sbdh</artifactId>
@@ -68,25 +68,55 @@
         </license>
     </licenses>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.6</version>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
-                        <id>xjc</id>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <generateDirectory>target/generated-sources/xjc/</generateDirectory>
+                            <schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
+                            <schemaIncludes>
+                                <include>*.xsd</include>
+                            </schemaIncludes>
+                            <bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
+                            <bindingIncludes>
+                                <include>*.xjb</include>
+                            </bindingIncludes>
+                            <generatePackage>network.oxalis.peppol.sbdh.jaxb</generatePackage>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <target>2.1</target>
-                    <packageName>network.oxalis.peppol.sbdh.jaxb</packageName>
-                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/peppol-schematron/pom.xml b/peppol-schematron/pom.xml
index 4155070..03d7637 100644
--- a/peppol-schematron/pom.xml
+++ b/peppol-schematron/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>network.oxalis.peppol</groupId>
         <artifactId>peppol-specifications</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>2.0.0-RC1-SNAPSHOT</version>
     </parent>
 
     <artifactId>peppol-schematron</artifactId>
@@ -66,6 +66,16 @@
     </licenses>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -80,21 +90,39 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.6</version>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
-                        <id>xjc</id>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <generateDirectory>target/generated-sources/xjc/</generateDirectory>
+                            <schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
+                            <schemaIncludes>
+                                <include>*.xsd</include>
+                            </schemaIncludes>
+                            <bindingDirectory>${basedir}/src/main/xjb</bindingDirectory>
+                            <bindingIncludes>
+                                <include>*.xjb</include>
+                            </bindingIncludes>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <target>2.1</target>
-                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/peppol-ubl21/pom.xml b/peppol-ubl21/pom.xml
index 8707a40..51161be 100644
--- a/peppol-ubl21/pom.xml
+++ b/peppol-ubl21/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>network.oxalis.peppol</groupId>
         <artifactId>peppol-specifications</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>2.0.0-RC1-SNAPSHOT</version>
     </parent>
 
     <artifactId>peppol-ubl21</artifactId>
@@ -66,6 +66,16 @@
     </licenses>
 
     <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -77,7 +87,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.2</version>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
                         <id>xsd</id>
@@ -105,8 +115,20 @@
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.3.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
-	
+
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 07b315f..448ee90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>network.oxalis.peppol</groupId>
     <artifactId>peppol-specifications</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>2.0.0-RC1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Peppol adopted specifications :: Parent</name>
@@ -15,6 +15,7 @@
         <module>peppol-bdx</module>
         <module>peppol-busdox</module>
         <module>peppol-sbdh</module>
+        <!-- Alert: Below modules are deprecated and will be removed soon -->
         <module>peppol-schematron</module>
         <module>peppol-ubl21</module>
     </modules>
@@ -62,14 +63,44 @@
 
     <properties>
         <java.encoding>UTF-8</java.encoding>
-        <java.version>1.8</java.version>
-        <testng.version>7.5</testng.version>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
+        <jaxb-impl-version>2.3.3</jaxb-impl-version>
+        <jakarta.xml.ws-api-version>2.3.3</jakarta.xml.ws-api-version>
+        <jakarta.jws-api-version>2.1.0</jakarta.jws-api-version>
+        <testng.version>7.7.1</testng.version>
         <Saxon-HE-version>9.7.0-20</Saxon-HE-version>
         <lombok-version>1.18.24</lombok-version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <!-- JAXB - Jakarta EE 8 update (Mar 2020) -->
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.xml.bind-api-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb-impl-version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>jakarta.xml.ws</groupId>
+                <artifactId>jakarta.xml.ws-api</artifactId>
+                <version>${jakarta.xml.ws-api-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.jws</groupId>
+                <artifactId>jakarta.jws-api</artifactId>
+                <version>${jakarta.jws-api-version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>